src/hotspot/share/logging/logConfiguration.cpp
changeset 49015 a12c9536d8a6
parent 48824 e48c4461a8bb
child 49016 ea85eed8b012
equal deleted inserted replaced
49014:407a8495d4b3 49015:a12c9536d8a6
     1 /*
     1 /*
     2  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
     2  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.
     7  * published by the Free Software Foundation.
   452     out->print("%s %s (%s)", (i == 0 ? "" : ","), LogDecorators::name(d), LogDecorators::abbreviation(d));
   452     out->print("%s %s (%s)", (i == 0 ? "" : ","), LogDecorators::name(d), LogDecorators::abbreviation(d));
   453   }
   453   }
   454   out->cr();
   454   out->cr();
   455 
   455 
   456   out->print("Available log tags:");
   456   out->print("Available log tags:");
   457   for (size_t i = 1; i < LogTag::Count; i++) {
   457   LogTag::list_tags(out);
   458     out->print("%s %s", (i == 1 ? "" : ","), LogTag::name(static_cast<LogTagType>(i)));
       
   459   }
       
   460   out->cr();
       
   461 
   458 
   462   LogTagSet::describe_tagsets(out);
   459   LogTagSet::describe_tagsets(out);
   463 }
   460 }
   464 
   461 
   465 void LogConfiguration::describe_current_configuration(outputStream* out){
   462 void LogConfiguration::describe_current_configuration(outputStream* out){
   492     LogDecorators::Decorator d = static_cast<LogDecorators::Decorator>(i);
   489     LogDecorators::Decorator d = static_cast<LogDecorators::Decorator>(i);
   493     jio_fprintf(out, "%s %s (%s)", (i == 0 ? "" : ","), LogDecorators::name(d), LogDecorators::abbreviation(d));
   490     jio_fprintf(out, "%s %s (%s)", (i == 0 ? "" : ","), LogDecorators::name(d), LogDecorators::abbreviation(d));
   494   }
   491   }
   495   jio_fprintf(out, "\n Decorators can also be specified as 'none' for no decoration.\n\n");
   492   jio_fprintf(out, "\n Decorators can also be specified as 'none' for no decoration.\n\n");
   496 
   493 
   497   jio_fprintf(out, "Available log tags:\n");
       
   498   for (size_t i = 1; i < LogTag::Count; i++) {
       
   499     jio_fprintf(out, "%s %s", (i == 1 ? "" : ","), LogTag::name(static_cast<LogTagType>(i)));
       
   500   }
       
   501   jio_fprintf(out, "\n Specifying 'all' instead of a tag combination matches all tag combinations.\n\n");
       
   502 
       
   503   fileStream stream(out, false);
   494   fileStream stream(out, false);
       
   495   stream.print_cr("Available log tags:");
       
   496   LogTag::list_tags(&stream);
       
   497   stream.print_cr(" Specifying 'all' instead of a tag combination matches all tag combinations.");
       
   498   stream.cr();
       
   499 
   504   LogTagSet::describe_tagsets(&stream);
   500   LogTagSet::describe_tagsets(&stream);
   505 
   501 
   506   jio_fprintf(out, "\nAvailable log outputs:\n"
   502   jio_fprintf(out, "\nAvailable log outputs:\n"
   507               " stdout, stderr, file=<filename>\n"
   503               " stdout, stderr, file=<filename>\n"
   508               " Specifying %%p and/or %%t in the filename will expand to the JVM's PID and startup timestamp, respectively.\n\n"
   504               " Specifying %%p and/or %%t in the filename will expand to the JVM's PID and startup timestamp, respectively.\n\n"