<div dir="ltr">I too have found the pattern<div>if (log)<br>{</div><div> log->Printf(....</div><div> ...);<br>}</div><div>too verbose as often over half of the code of a function is just logging. I don't find LOG_IFANY macros particularly useful as I haven't found a need for complicated log flag combinations within the same function, but I would welcome any reasonable way of shortening things.</div><div><br></div><div>However, I don't feel particularly strongly about that now (maybe I will change my mind if I need to write a big chunk of new code :), so I am fine with staying at the status quo.</div><div><br></div><div>cheers,</div><div>pl</div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On 30 April 2015 at 22:47, Zachary Turner <span dir="ltr"><<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">FWIW, at least for now these macros will *still* have to go in the logging plugin. The reason being that each logging plugging is implemented by a separate class, and has its own set of GetLogIf methods. There might be a good way to make common macros that are concise enough that they still retain the benefit we're trying to achieve in the first place, and are flexible enough that they can get the log for an arbitrary plugin, but it's not immediately obvious.<br><div><br></div><div>In any case, I'll put these macros in ProcessWindowsLog for now. <span style="line-height:1.5;font-size:13.1999998092651px">At the same time, feel free to glance over the patch when it goes through (which probabyl won't be today). At the very least you can see how I'm using it so at least you have some context about why I think it improves readability for my use case (even if you still don't agree). I'm still open to further improvements or alternative approaches as well.</span></div></div><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote">On Thu, Apr 30, 2015 at 2:29 PM <<a href="mailto:jingham@apple.com" target="_blank">jingham@apple.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">You are overselling the advantages, since there are very few if any functions in lldb that log to more than one set of flags. That's for good reason: any given method should be implementing some coherent piece of the functionality, and if it needs to log to different places as it goes along then it is probably doing too many things at once...<br>
<br>
Your suggestion removes the initial log definition, but that is up at the top of the function and isn't going to cause trouble reading the logic of the function so I'm not much moved by that gain. And if we do your LOGIF version, now every log message looks like:<br>
<br>
LOGF_IFANY(LLDB_LOG_EXPRESSION | LLDB_LOG_TYPES, "This is the interesting part")<br>
<br>
I don't at all see how that is easier to read than a definition once that I don't have to look at unless I care where this function is logging, and:<br>
<br>
if (log)<br>
log->Printf("This is the interesting part")<br>
<br>
To my eye, the first version is much more visual noise.<br>
<br>
But if other people really like this I see no reason not to make it an option.<br>
<br>
We'll have to keep the "get a log and check if it is null" method anyway, since, for instance, if you have to gather data through an API that takes a StreamString you'll still need to do:<br>
<br>
if (log)<br>
{<br>
StreamString s;<br>
APIThatTakesAStream(s);<br>
log->Printf ("%s", s.GetData());<br>
}<br>
<br>
So I can keep using extant form in code I write, and other folks can do what they like in new code.<br>
<br>
To tell the truth, so long as it isn't confusing I actually like it that minor stylistic differences like this are possible. It is sometimes useful to have a spidey-sense for "Ohh this code was probably written by person X". Knowing the quirks (and commonly made mistakes) of person X can help when you're reading the code ...<br>
<br>
Jim<br>
<br>
<br>
<br>
> On Apr 30, 2015, at 1:16 PM, Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
><br>
> Consider the case where you want to have one function with 3 log statements:<br>
><br>
> 1) The first log statement should happen if both FLAG1 and FLAG2 are set.<br>
> 2) The second log statement should happen if either FLAG1 or FLAG2 are set.<br>
> 3) The third log statement should happen in the same as case 1, but only if verbose is enabled.<br>
><br>
> Here's how you express this currently (there are alternative approaches:<br>
><br>
> Log *log1 = GetLogIfAllCategoriesSet(FLAG1 | FLAG2);<br>
> if (log1)<br>
> log1->Printf("Log statement %d", 1);<br>
><br>
> Log *log2 = GetLogIfAnyCategoriesSet(FLAG1 | FLAG2);<br>
> if (log2)<br>
> log2->Printf("Log statement %d", 2);<br>
><br>
> if (log1 && log1->IsVerbose())<br>
> log1->Printf("Log statement %d", 3);<br>
><br>
> That's 8 lines of code to print 3 log statements. Compare to:<br>
><br>
> LOGF_IFANY(FLAG1|FLAG2, "Log statement %d", 1); // The F in LOGF means "with flags" (name not final)<br>
> LOGF_IFALL(FLAG1|FLAG2, "Log statement %d", 2);<br>
> VLOGF_IFANY(FLAG1|FLAG2, "Log statement %d", 3); // The V means verbose<br>
><br>
> This approach has significantly less visual noise, and you always have one line for each log statement. So I think it's much more readable. I agree in principle that macros are undesirable when they prevent the ability to reason about the code hiding behind the macro, but of course it's a tradeoff. And I think a good one in this case. The macro is small, and the benefit is noticeable. I know this all seems hypothetical, but the reason I embarked on this is because the logging code I'm adding to ProcessWindows was seeing the same kind of improvement in readability as the above example. So it's solving a real problem.<br>
><br>
> Of course it's computing the flags each time. It's a pretty trivial cost (a few assembly instructions) and I think the improvement in readability is enough to justify this, but if not, we could have another macro which takes a pointer to a previously computed Log. For example:<br>
><br>
> LOG_IF(log, "Log statement %d", 1); // Note the lack of F in the macro name. Differentiates this from the Flags method.<br>
><br>
><br>
> Of course, I agree with you that we shouldn't go and make a blanket change across the code change because of the amount of churn it would create. On the other hand, I don't think we should be so wary of making gradual improvements to the codebase just because we can't make the change all at once. Adding the 'override' keyword was a good example of this. It's already helped me to catch a few errors in my own code, and I've even committed a few patches to code that didn't use override which were broken as a result, and I went and added the 'override' keyword after the fact. But if we just said "we're not going to be using the override keyword" then my the first case might not have been found until much later, and the second case (which I did find even though not using the override keyword) is very likely to have wasted someone else's time in the future.<br>
><br>
> On Thu, Apr 30, 2015 at 12:03 PM <<a href="mailto:jingham@apple.com" target="_blank">jingham@apple.com</a>> wrote:<br>
> Sorry, mail from lldb-commits has been very flakey for me for some reason, I didn't see this part of the thread till just now...<br>
><br>
> I still think this is a solution in search of a problem, and since we certainly shouldn't change all the log statements in lldb to use some macro - that is code churn for no very good reason - it will leave us with an inconsistent use of logging through-out lldb, which is unfortunate. I don't in general like macros that wrap syntax since then you can't reason about the code without knowing what the macro transformation is...<br>
><br>
> But it is better than the NullLog solution.<br>
><br>
> Jim<br>
><br>
><br>
> > On Apr 30, 2015, at 11:39 AM, Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
> ><br>
> > Also judging from Pavel's email it sounds like I'm not the only one who wants to see more concise logging statements. So in that regard, locking this away in ProcessWindows doesn't seem like the ideal solution either, because it will just lead to other people who own different plugins or different areas re-inventing their own method to shorten the log statements. So I think it would be great if we could come to some sort of compromise. I feel like the macro solution is the best compromise I've seen as of yet. While there would still be 2 ways to log (the current approach of checking the pointer very time, vs using the macro), they would have basically identical performance characteristics, and we could always begin migrating existing code toward the macro method as we touch surrounding code.<br>
> ><br>
> > On Thu, Apr 30, 2015 at 10:55 AM Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
> > Even ignoring the 3 extra lines issue (which I disagree is a problem of my own making, I think you'll find it's quite common for developers to want to maximize the density of code on their screen), there is still the indentation issue.<br>
> ><br>
> > Did you dislike the macro suggestion by Pavel (and my followup) as well? There are no performance implications, no extraneous goo in front of the actual content of the log statement, and nobody has to worry about using the wrong method. Only reduced indentation and fewer lines of code.<br>
> ><br>
> > I haven't yet seen a good argument for at least that to not go in.<br>
> ><br>
> > On Thu, Apr 30, 2015 at 10:42 AM <<a href="mailto:jingham@apple.com" target="_blank">jingham@apple.com</a>> wrote:<br>
> ><br>
> > > On Apr 29, 2015, at 7:23 PM, Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
> > ><br>
> > > The problem is when the log statements aren't simple, which turns out to be most of the time in my case. They log statement itself wraps a couple times, and when i have an if statement with only one statement inside, i use curly braces if the line wraps. So I'm adding 3 additional lines with each log statement that are removed by having the NullLog pattern. Add to that it decreases indentation (which is important for me since i have two or three windows opened side by side) and the difference between reading code that uses if (log) versus code that just calls the print method is night and day for me.<br>
> > ><br>
> > > What do you think about Enrico's suggestion? If there's a way to make this useful for everyone it's certainly better than me doing my own thing in ProcessWindows, but when i look at my code decorated with log statements using the existing paradigm, it's significantly harder to read than using the NullLog paradigm, so i guess i will still move it to ProcessWindows if that's the only way.<br>
> ><br>
> ><br>
> > I don't find Enrico's suggestion particularly appealing. After all it means the log statements you wanted to make cleaner looking are going to have a bunch of extraneous goo in front of the actual content to set up the std::function that gets passed. In Enrico's example it is 30 or so chicken tracks before you get to the log statement, and that's probably going to push it far enough to the right in most cases you will want to wrap it anyway, so I doubt it will make things look any nicer.<br>
> ><br>
> > I don't find writing the log messages out to 120 characters a problem for viewing code side by side to be a big problem. If your monitor forces you to shorten two windows in order to set them side by side, that just means the ends of the log lines aren't visible. But when you are scanning code for logic or comparing two implementations it's generally not the ends of the log lines that you are scrutinizing, so that they run off the end of the window is not a big deal. And I don't see where:<br>
> ><br>
> > if (log)<br>
> > log->Printf("some text"<br>
> > " some more text");<br>
> ><br>
> > really requires brackets to be clear, the alignment of the pieces of text (and printf arguments) generally makes what is going on clear... So it seems to me you are solving a problem of your own making.<br>
> ><br>
> > If I had all my druthers I would rather not have two patterns for logging hanging around in the code, especially when one of them requires more care to keep it from having performance implications - if I were more fanatical about insisting on my opinions I'd go remove the LogIf calls as well... But in any case, I would really rather you didn't introduce this into general lldb code.<br>
> ><br>
> > Jim<br>
> ><br>
> ><br>
> > > On Wed, Apr 29, 2015 at 6:49 PM <<a href="mailto:jingham@apple.com" target="_blank">jingham@apple.com</a>> wrote:<br>
> > > In general, for simple logs we do:<br>
> > ><br>
> > > if (log)<br>
> > > log->Printf("");<br>
> > ><br>
> > > So you are only saving one line and a bit of indentation per log. I'm not sure I buy that this makes the code that much uglier - especially because it's really the noise of the characters in the log string that distract your eye and you can't do anything about that.<br>
> > ><br>
> > > I would really rather not have to have two log printing routes, one of which you would use if you KNOW that the data you are marshalling is free to assemble, and one where you might have more complex data. It is often surprising how a simple lookup can end up in a slog through lots of debug info. And while it is true we have to think about that carefully in the algorithms we write for say stepping or variable printing or whatever, I would really rather not have folks have to consider that for logging.<br>
> > ><br>
> > > This is actually somewhat important because we deal with lots of folks who can't give us their projects when they run into debugging problems. So logging is the only way we can sort out what are sometimes very gnarly problems. I want logging to be constant cost regardless of the information you've decided to gather so that people will be free to make the logging as rich and informative as it needs to be. I just don't see enough benefit from this to warrant the cognitive burden it imposes on something that should be simple.<br>
> > ><br>
> > > If you really want this in the ProcessWindows plugin, that's your baby so... But please put in some comment saying "Watch out for the costs of the arguments you might muster here" and "Don't use this for generic logging" so the policy is clear...<br>
> > ><br>
> > > Jim<br>
> > ><br>
> > > > On Apr 29, 2015, at 6:35 PM, Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
> > > ><br>
> > > > If you don't want it in Core, I can move it to ProcessWindows. But locally I've added logging where you can't even look at the function and tell what it does anymore because of all the logging. I really don't want so much boilerplate code taking up screen space in important methods, preventing you from understanding what the methods do because each log statement is 4 lines instead of 1.<br>
> > > ><br>
> > > > I'm open to suggestions, but ultimately in the code I'm writing in the windows plugin, I don't want to check if statements every time I write a log statement, so I need some kind of solution that makes that not necessary.<br>
> > > ><br>
> > > > On Wed, Apr 29, 2015 at 6:29 PM <<a href="mailto:jingham@apple.com" target="_blank">jingham@apple.com</a>> wrote:<br>
> > > > Yes, but that call is only used a handful of times, and only from code written back before this was checked into <a href="http://llvm.org" target="_blank">llvm.org</a>, so that's more an argument for removing those calls than making that pattern more common.<br>
> > > ><br>
> > > > I really don't want people to have to reason about the expense of logging. I want there to be full rich log output that costs nothing when not turned on. It's so easy to add something that looks harmless to a log, but that ends up pulling in a whole bunch of debug information that we were trying hard not to touch. You probably won't notice that till you run on something really big, but then we will get slowdowns for no benefit.<br>
> > > ><br>
> > > > Jim<br>
> > > ><br>
> > > ><br>
> > > > > On Apr 29, 2015, at 6:18 PM, Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
> > > > ><br>
> > > > > It's also worth pointing out that the method I've implemented here is a more general case of something already in LLDB. lldb_private::LogIfXXXCategoriesSet(). These 2 methods are equivalent to getting the log, checking for null, and logging if non null, except they always evaluate the arguments, as does my method. But the method I've implemented here allows access to every method of Log. Like Warn, Error, etc, so is even more flexible<br>
> > > > > On Wed, Apr 29, 2015 at 6:14 PM Enrico Granata <<a href="mailto:egranata@apple.com" target="_blank">egranata@apple.com</a>> wrote:<br>
> > > > > One possible avenue to fix the performance issue would be to have your log calls take a lambda expression that returns the string to be printed, e.g.<br>
> > > > ><br>
> > > > > #include <functional><br>
> > > > > #include <string><br>
> > > > > #include <iostream><br>
> > > > > #include <stdlib.h><br>
> > > > ><br>
> > > > > typedef std::function<std::string()> LogFunction;<br>
> > > > ><br>
> > > > > void log(bool dolog, LogFunction f) {<br>
> > > > > if (dolog)<br>
> > > > > std::cout << f() << std::endl;<br>
> > > > > }<br>
> > > > ><br>
> > > > > int main() {<br>
> > > > > log(true, [] () -> std::string { return "hello world"; } );<br>
> > > > > log(false, [] {sleep(10); return "hi"; });<br>
> > > > > return 0;<br>
> > > > > }<br>
> > > > ><br>
> > > > > I don’t think the code gets much better doing this compared to the previous if (log) model we were using - but that’s at least arguable<br>
> > > > ><br>
> > > > ><br>
> > > > >> More importantly, I don't think this is a good change. I want to be able to freely put complex log statements where ever I need without having to worry about the performance implications. That was always possible, because the cost of not logging was checking if log was NULL.<br>
> > > > >><br>
> > > > >> With this change I'm always going to get back a log, so I'm always going to marshall the arguments, and do whatever work was going to go into printing, etc and then call a virtual function that does nothing with the results.<br>
> > > > >><br>
> > > > >> That seems undesirable to me. You could work around this by having any code that does logging in a loop or that has complex arguments check if the log is a null log and not do the work if it is, but then we're right back where we started except now we only do the check sometimes, making things even more confusing.<br>
> > > > >><br>
> > > > >> Jim<br>
> > > > >><br>
> > > > >> On Apr 29, 2015, at 4:30 PM, Sean Callanan <<a href="mailto:scallanan@apple.com" target="_blank">scallanan@apple.com</a>> wrote:<br>
> > > > >><br>
> > > > >> Zachary,<br>
> > > > >><br>
> > > > >> Log.cpp doesn’t build anymore with this change. In particular, you have<br>
> > > > >> –<br>
> > > > >> + virtual void<br>
> > > > >> + VAPrintf(const char *format, va_list args);<br>
> > > > >> –<br>
> > > > >> but at several places VAPrintf is called with no va_list, e.g.,<br>
> > > > >> –<br>
> > > > >> void<br>
> > > > >> -Log::Error (const char *format, ...)<br>
> > > > >> +Log::Error(const char *format, ...)<br>
> > > > >> {<br>
> > > > >> - char *arg_msg = NULL;<br>
> > > > >> + char *arg_msg = nullptr;<br>
> > > > >> va_list args;<br>
> > > > >> - va_start (args, format);<br>
> > > > >> - ::vasprintf (&arg_msg, format, args);<br>
> > > > >> - va_end (args);<br>
> > > > >> + va_start(args, format);<br>
> > > > >> + ::vasprintf(&arg_msg, format, args);<br>
> > > > >> + va_end(args);<br>
> > > > >><br>
> > > > >> - if (arg_msg != NULL)<br>
> > > > >> - {<br>
> > > > >> - PrintfWithFlags (LLDB_LOG_FLAG_ERROR, "error: %s", arg_msg);<br>
> > > > >> - free (arg_msg);<br>
> > > > >> - }<br>
> > > > >> + if (arg_msg == nullptr)<br>
> > > > >> + return;<br>
> > > > >> +<br>
> > > > >> + VAPrintf("error: %s", arg_msg);<br>
> > > > >> + free(arg_msg);<br>
> > > > >> }<br>
> > > > >> –<br>
> > > > >> Do you have more commits coming that are going to resolve this problem?<br>
> > > > >><br>
> > > > >> Sean<br>
> > > > >><br>
> > > > >><br>
> > > > >>> On Apr 29, 2015, at 3:55 PM, Zachary Turner <<a href="mailto:zturner@google.com" target="_blank">zturner@google.com</a>> wrote:<br>
> > > > >>><br>
> > > > >>> Author: zturner<br>
> > > > >>> Date: Wed Apr 29 17:55:28 2015<br>
> > > > >>> New Revision: 236174<br>
> > > > >>><br>
> > > > >>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=236174&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=236174&view=rev</a><br>
> > > > >>> Log:<br>
> > > > >>> Introduce a NullLog class, which ignores all messages.<br>
> > > > >>><br>
> > > > >>> The purpose of this class is so that GetLogIfAllCategoriesSet<br>
> > > > >>> can always return an instance of some class, whether it be a real<br>
> > > > >>> logging class or a "null" class, which ignores messages. Code<br>
> > > > >>> that is littered with if statements that only log if the pointer<br>
> > > > >>> is non-null can get very unwieldy very quickly, so this should<br>
> > > > >>> help code readability in such circumstances.<br>
> > > > >>><br>
> > > > >>> Since I'm in this code anyway, I'm also deleting the<br>
> > > > >>> PrintfWithFlags methods, as well as all the flags, since they<br>
> > > > >>> appear to be dead code that have been superceded by newer<br>
> > > > >>> mechanisms and all the flags are simply ignored.<br>
> > > > >>><br>
> > > > >>> Added:<br>
> > > > >>> lldb/trunk/include/lldb/Core/NullLog.h<br>
> > > > >>> lldb/trunk/source/Core/NullLog.cpp<br>
> > > > >>> Modified:<br>
> > > > >>> lldb/trunk/include/lldb/Core/Log.h<br>
> > > > >>> lldb/trunk/source/Core/CMakeLists.txt<br>
> > > > >>> lldb/trunk/source/Core/Log.cpp<br>
> > > > >>><br>
> > > > >>> Modified: lldb/trunk/include/lldb/Core/Log.h<br>
> > > > >>> URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Log.h?rev=236174&r1=236173&r2=236174&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Log.h?rev=236174&r1=236173&r2=236174&view=diff</a><br>
> > > > >>> ==============================================================================<br>
> > > > >>> --- lldb/trunk/include/lldb/Core/Log.h (original)<br>
> > > > >>> +++ lldb/trunk/include/lldb/Core/Log.h Wed Apr 29 17:55:28 2015<br>
> > > > >>> @@ -26,17 +26,6 @@<br>
> > > > >>> #include "lldb/Core/PluginInterface.h"<br>
> > > > >>><br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> -// Logging types<br>
> > > > >>> -//----------------------------------------------------------------------<br>
> > > > >>> -#define LLDB_LOG_FLAG_STDOUT (1u << 0)<br>
> > > > >>> -#define LLDB_LOG_FLAG_STDERR (1u << 1)<br>
> > > > >>> -#define LLDB_LOG_FLAG_FATAL (1u << 2)<br>
> > > > >>> -#define LLDB_LOG_FLAG_ERROR (1u << 3)<br>
> > > > >>> -#define LLDB_LOG_FLAG_WARNING (1u << 4)<br>
> > > > >>> -#define LLDB_LOG_FLAG_DEBUG (1u << 5)<br>
> > > > >>> -#define LLDB_LOG_FLAG_VERBOSE (1u << 6)<br>
> > > > >>> -<br>
> > > > >>> -//----------------------------------------------------------------------<br>
> > > > >>> // Logging Options<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> #define LLDB_LOG_OPTION_THREADSAFE (1u << 0)<br>
> > > > >>> @@ -61,12 +50,10 @@ public:<br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> // Callback definitions for abstracted plug-in log access.<br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> - typedef void (*DisableCallback) (const char **categories, Stream *feedback_strm);<br>
> > > > >>> - typedef Log * (*EnableCallback) (lldb::StreamSP &log_stream_sp,<br>
> > > > >>> - uint32_t log_options,<br>
> > > > >>> - const char **categories,<br>
> > > > >>> - Stream *feedback_strm);<br>
> > > > >>> - typedef void (*ListCategoriesCallback) (Stream *strm);<br>
> > > > >>> + typedef void (*DisableCallback)(const char **categories, Stream *feedback_strm);<br>
> > > > >>> + typedef Log *(*EnableCallback)(lldb::StreamSP &log_stream_sp, uint32_t log_options, const char **categories,<br>
> > > > >>> + Stream *feedback_strm);<br>
> > > > >>> + typedef void (*ListCategoriesCallback)(Stream *strm);<br>
> > > > >>><br>
> > > > >>> struct Callbacks<br>
> > > > >>> {<br>
> > > > >>> @@ -79,86 +66,78 @@ public:<br>
> > > > >>> // Static accessors for logging channels<br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> static void<br>
> > > > >>> - RegisterLogChannel (const ConstString &channel,<br>
> > > > >>> - const Log::Callbacks &log_callbacks);<br>
> > > > >>> + RegisterLogChannel(const ConstString &channel, const Log::Callbacks &log_callbacks);<br>
> > > > >>><br>
> > > > >>> static bool<br>
> > > > >>> - UnregisterLogChannel (const ConstString &channel);<br>
> > > > >>> + UnregisterLogChannel(const ConstString &channel);<br>
> > > > >>><br>
> > > > >>> static bool<br>
> > > > >>> - GetLogChannelCallbacks (const ConstString &channel,<br>
> > > > >>> - Log::Callbacks &log_callbacks);<br>
> > > > >>> -<br>
> > > > >>> + GetLogChannelCallbacks(const ConstString &channel, Log::Callbacks &log_callbacks);<br>
> > > > >>><br>
> > > > >>> static void<br>
> > > > >>> - EnableAllLogChannels (lldb::StreamSP &log_stream_sp,<br>
> > > > >>> - uint32_t log_options,<br>
> > > > >>> - const char **categories,<br>
> > > > >>> - Stream *feedback_strm);<br>
> > > > >>> + EnableAllLogChannels(lldb::StreamSP &log_stream_sp, uint32_t log_options, const char **categories,<br>
> > > > >>> + Stream *feedback_strm);<br>
> > > > >>><br>
> > > > >>> static void<br>
> > > > >>> - DisableAllLogChannels (Stream *feedback_strm);<br>
> > > > >>> + DisableAllLogChannels(Stream *feedback_strm);<br>
> > > > >>><br>
> > > > >>> static void<br>
> > > > >>> - ListAllLogChannels (Stream *strm);<br>
> > > > >>> + ListAllLogChannels(Stream *strm);<br>
> > > > >>><br>
> > > > >>> static void<br>
> > > > >>> - Initialize ();<br>
> > > > >>> + Initialize();<br>
> > > > >>><br>
> > > > >>> static void<br>
> > > > >>> - Terminate ();<br>
> > > > >>> -<br>
> > > > >>> + Terminate();<br>
> > > > >>> +<br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> // Auto completion<br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> static void<br>
> > > > >>> - AutoCompleteChannelName (const char *channel_name,<br>
> > > > >>> - StringList &matches);<br>
> > > > >>> + AutoCompleteChannelName(const char *channel_name, StringList &matches);<br>
> > > > >>><br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> // Member functions<br>
> > > > >>> //------------------------------------------------------------------<br>
> > > > >>> - Log ();<br>
> > > > >>> + Log();<br>
> > > > >>><br>
> > > > >>> - Log (const lldb::StreamSP &stream_sp);<br>
> > > > >>> + Log(const lldb::StreamSP &stream_sp);<br>
> > > > >>><br>
> > > > >>> - ~Log ();<br>
> > > > >>> -<br>
> > > > >>> - void<br>
> > > > >>> - PutCString (const char *cstr);<br>
> > > > >>> + virtual<br>
> > > > >>> + ~Log();<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - Printf (const char *format, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + PutCString(const char *cstr);<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - VAPrintf (const char *format, va_list args);<br>
> > > > >>> + virtual void<br>
> > > > >>> + Printf(const char *format, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - PrintfWithFlags( uint32_t flags, const char *format, ...) __attribute__ ((format (printf, 3, 4)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + VAPrintf(const char *format, va_list args);<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - LogIf (uint32_t mask, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + LogIf(uint32_t mask, const char *fmt, ...) __attribute__((format(printf, 3, 4)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - Debug (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + Debug(const char *fmt, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - DebugVerbose (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + DebugVerbose(const char *fmt, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - Error (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + Error(const char *fmt, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - FatalError (int err, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + FatalError(int err, const char *fmt, ...) __attribute__((format(printf, 3, 4)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - Verbose (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + Verbose(const char *fmt, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - Warning (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + Warning(const char *fmt, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - WarningVerbose (const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));<br>
> > > > >>> + virtual void<br>
> > > > >>> + WarningVerbose(const char *fmt, ...) __attribute__((format(printf, 2, 3)));<br>
> > > > >>><br>
> > > > >>> Flags &<br>
> > > > >>> GetOptions();<br>
> > > > >>> @@ -179,7 +158,7 @@ public:<br>
> > > > >>> GetDebug() const;<br>
> > > > >>><br>
> > > > >>> void<br>
> > > > >>> - SetStream (const lldb::StreamSP &stream_sp)<br>
> > > > >>> + SetStream(const lldb::StreamSP &stream_sp)<br>
> > > > >>> {<br>
> > > > >>> m_stream_sp = stream_sp;<br>
> > > > >>> }<br>
> > > > >>> @@ -192,43 +171,35 @@ protected:<br>
> > > > >>> Flags m_options;<br>
> > > > >>> Flags m_mask_bits;<br>
> > > > >>><br>
> > > > >>> - void<br>
> > > > >>> - PrintfWithFlagsVarArg (uint32_t flags, const char *format, va_list args);<br>
> > > > >>> -<br>
> > > > >>> private:<br>
> > > > >>> - DISALLOW_COPY_AND_ASSIGN (Log);<br>
> > > > >>> + DISALLOW_COPY_AND_ASSIGN(Log);<br>
> > > > >>> };<br>
> > > > >>><br>
> > > > >>><br>
> > > > >>> class LogChannel : public PluginInterface<br>
> > > > >>> {<br>
> > > > >>> public:<br>
> > > > >>> - LogChannel ();<br>
> > > > >>> + LogChannel();<br>
> > > > >>><br>
> > > > >>> - virtual<br>
> > > > >>> - ~LogChannel ();<br>
> > > > >>> + virtual ~LogChannel();<br>
> > > > >>><br>
> > > > >>> - static lldb::LogChannelSP<br>
> > > > >>> - FindPlugin (const char *plugin_name);<br>
> > > > >>> + static lldb::LogChannelSP FindPlugin(const char *plugin_name);<br>
> > > > >>><br>
> > > > >>> // categories is a an array of chars that ends with a NULL element.<br>
> > > > >>> - virtual void<br>
> > > > >>> - Disable (const char **categories, Stream *feedback_strm) = 0;<br>
> > > > >>> + virtual void Disable(const char **categories, Stream *feedback_strm) = 0;<br>
> > > > >>><br>
> > > > >>> - virtual bool<br>
> > > > >>> - Enable (lldb::StreamSP &log_stream_sp,<br>
> > > > >>> - uint32_t log_options,<br>
> > > > >>> - Stream *feedback_strm, // Feedback stream for argument errors etc<br>
> > > > >>> - const char **categories) = 0;// The categories to enable within this logging stream, if empty, enable default set<br>
> > > > >>> + virtual bool Enable(<br>
> > > > >>> + lldb::StreamSP &log_stream_sp, uint32_t log_options,<br>
> > > > >>> + Stream *feedback_strm, // Feedback stream for argument errors etc<br>
> > > > >>> + const char **categories) = 0; // The categories to enable within this logging stream, if empty, enable default set<br>
> > > > >>><br>
> > > > >>> - virtual void<br>
> > > > >>> - ListCategories (Stream *strm) = 0;<br>
> > > > >>> + virtual void ListCategories(Stream *strm) = 0;<br>
> > > > >>><br>
> > > > >>> protected:<br>
> > > > >>> std::unique_ptr<Log> m_log_ap;<br>
> > > > >>><br>
> > > > >>> private:<br>
> > > > >>> - DISALLOW_COPY_AND_ASSIGN (LogChannel);<br>
> > > > >>> + DISALLOW_COPY_AND_ASSIGN(LogChannel);<br>
> > > > >>> };<br>
> > > > >>><br>
> > > > >>><br>
> > > > >>><br>
> > > > >>> Added: lldb/trunk/include/lldb/Core/NullLog.h<br>
> > > > >>> URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/NullLog.h?rev=236174&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/NullLog.h?rev=236174&view=auto</a><br>
> > > > >>> ==============================================================================<br>
> > > > >>> --- lldb/trunk/include/lldb/Core/NullLog.h (added)<br>
> > > > >>> +++ lldb/trunk/include/lldb/Core/NullLog.h Wed Apr 29 17:55:28 2015<br>
> > > > >>> @@ -0,0 +1,58 @@<br>
> > > > >>> +//===-- NullLog.h -----------------------------------------------*- C++ -*-===//<br>
> > > > >>> +//<br>
> > > > >>> +// The LLVM Compiler Infrastructure<br>
> > > > >>> +//<br>
> > > > >>> +// This file is distributed under the University of Illinois Open Source<br>
> > > > >>> +// License. See LICENSE.TXT for details.<br>
> > > > >>> +//<br>
> > > > >>> +//===----------------------------------------------------------------------===//<br>
> > > > >>> +<br>
> > > > >>> +#ifndef liblldb_Core_NullLog_H_<br>
> > > > >>> +#define liblldb_Core_NullLog_H_<br>
> > > > >>> +<br>
> > > > >>> +#include "lldb/Core/Log.h"<br>
> > > > >>> +<br>
> > > > >>> +//----------------------------------------------------------------------<br>
> > > > >>> +// Logging Functions<br>
> > > > >>> +//----------------------------------------------------------------------<br>
> > > > >>> +namespace lldb_private<br>
> > > > >>> +{<br>
> > > > >>> +<br>
> > > > >>> +class NullLog : public Log<br>
> > > > >>> +{<br>
> > > > >>> + NullLog(NullLog &) = delete;<br>
> > > > >>> + NullLog &operator=(NullLog &) = delete;<br>
> > > > >>> +<br>
> > > > >>> + public:<br>
> > > > >>> + //------------------------------------------------------------------<br>
> > > > >>> + // Member functions<br>
> > > > >>> + //------------------------------------------------------------------<br>
> > > > >>> + NullLog();<br>
> > > > >>> + ~NullLog();<br>
> > > > >>> +<br>
> > > > >>> + void PutCString(const char *cstr) override;<br>
> > > > >>> +<br>
> > > > >>> + void Printf(const char *format, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +<br>
> > > > >>> + void VAPrintf(const char *format, va_list args) override;<br>
> > > > >>> +<br>
> > > > >>> + void LogIf(uint32_t mask, const char *fmt, ...) override __attribute__((format(printf, 3, 4)));<br>
> > > > >>> +<br>
> > > > >>> + void Debug(const char *fmt, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +<br>
> > > > >>> + void DebugVerbose(const char *fmt, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +<br>
> > > > >>> + void Error(const char *fmt, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +<br>
> > > > >>> + void FatalError(int err, const char *fmt, ...) override __attribute__((format(printf, 3, 4)));<br>
> > > > >>> +<br>
> > > > >>> + void Verbose(const char *fmt, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +<br>
> > > > >>> + void Warning(const char *fmt, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +<br>
> > > > >>> + void WarningVerbose(const char *fmt, ...) override __attribute__((format(printf, 2, 3)));<br>
> > > > >>> +};<br>
> > > > >>> +<br>
> > > > >>> +} // namespace lldb_private<br>
> > > > >>> +<br>
> > > > >>> +#endif // liblldb_Core_NullLog_H_<br>
> > > > >>><br>
> > > > >>> Modified: lldb/trunk/source/Core/CMakeLists.txt<br>
> > > > >>> URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/CMakeLists.txt?rev=236174&r1=236173&r2=236174&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/CMakeLists.txt?rev=236174&r1=236173&r2=236174&view=diff</a><br>
> > > > >>> ==============================================================================<br>
> > > > >>> --- lldb/trunk/source/Core/CMakeLists.txt (original)<br>
> > > > >>> +++ lldb/trunk/source/Core/CMakeLists.txt Wed Apr 29 17:55:28 2015<br>
> > > > >>> @@ -38,6 +38,7 @@ add_lldb_library(lldbCore<br>
> > > > >>> Module.cpp<br>
> > > > >>> ModuleChild.cpp<br>
> > > > >>> ModuleList.cpp<br>
> > > > >>> + NullLog.cpp<br>
> > > > >>> Opcode.cpp<br>
> > > > >>> PluginManager.cpp<br>
> > > > >>> RegisterValue.cpp<br>
> > > > >>><br>
> > > > >>> Modified: lldb/trunk/source/Core/Log.cpp<br>
> > > > >>> URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Log.cpp?rev=236174&r1=236173&r2=236174&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Log.cpp?rev=236174&r1=236173&r2=236174&view=diff</a><br>
> > > > >>> ==============================================================================<br>
> > > > >>> --- lldb/trunk/source/Core/Log.cpp (original)<br>
> > > > >>> +++ lldb/trunk/source/Core/Log.cpp Wed Apr 29 17:55:28 2015<br>
> > > > >>> @@ -77,6 +77,23 @@ Log::GetMask() const<br>
> > > > >>> return m_mask_bits;<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>> +void<br>
> > > > >>> +Log::PutCString(const char *cstr)<br>
> > > > >>> +{<br>
> > > > >>> + Printf("%s", cstr);<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +//----------------------------------------------------------------------<br>
> > > > >>> +// Simple variable argument logging with flags.<br>
> > > > >>> +//----------------------------------------------------------------------<br>
> > > > >>> +void<br>
> > > > >>> +Log::Printf(const char *format, ...)<br>
> > > > >>> +{<br>
> > > > >>> + va_list args;<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + VAPrintf(format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>> +}<br>
> > > > >>><br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> // All logging eventually boils down to this function call. If we have<br>
> > > > >>> @@ -84,7 +101,7 @@ Log::GetMask() const<br>
> > > > >>> // a valid file handle, we also log to the file.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::PrintfWithFlagsVarArg (uint32_t flags, const char *format, va_list args)<br>
> > > > >>> +Log::VAPrintf(const char *format, va_list args)<br>
> > > > >>> {<br>
> > > > >>> // Make a copy of our stream shared pointer in case someone disables our<br>
> > > > >>> // log while we are logging and releases the stream<br>
> > > > >>> @@ -136,59 +153,20 @@ Log::PrintfWithFlagsVarArg (uint32_t fla<br>
> > > > >>> }<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>> -<br>
> > > > >>> -void<br>
> > > > >>> -Log::PutCString (const char *cstr)<br>
> > > > >>> -{<br>
> > > > >>> - Printf ("%s", cstr);<br>
> > > > >>> -}<br>
> > > > >>> -<br>
> > > > >>> -<br>
> > > > >>> -//----------------------------------------------------------------------<br>
> > > > >>> -// Simple variable argument logging with flags.<br>
> > > > >>> -//----------------------------------------------------------------------<br>
> > > > >>> -void<br>
> > > > >>> -Log::Printf(const char *format, ...)<br>
> > > > >>> -{<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - PrintfWithFlagsVarArg (0, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> -}<br>
> > > > >>> -<br>
> > > > >>> -void<br>
> > > > >>> -Log::VAPrintf (const char *format, va_list args)<br>
> > > > >>> -{<br>
> > > > >>> - PrintfWithFlagsVarArg (0, format, args);<br>
> > > > >>> -}<br>
> > > > >>> -<br>
> > > > >>> -<br>
> > > > >>> -//----------------------------------------------------------------------<br>
> > > > >>> -// Simple variable argument logging with flags.<br>
> > > > >>> -//----------------------------------------------------------------------<br>
> > > > >>> -void<br>
> > > > >>> -Log::PrintfWithFlags (uint32_t flags, const char *format, ...)<br>
> > > > >>> -{<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - PrintfWithFlagsVarArg (flags, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> -}<br>
> > > > >>> -<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> // Print debug strings if and only if the global debug option is set to<br>
> > > > >>> // a non-zero value.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::Debug (const char *format, ...)<br>
> > > > >>> +Log::Debug(const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - if (GetOptions().Test(LLDB_LOG_OPTION_DEBUG))<br>
> > > > >>> - {<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - PrintfWithFlagsVarArg (LLDB_LOG_FLAG_DEBUG, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> - }<br>
> > > > >>> + if (!GetOptions().Test(LLDB_LOG_OPTION_DEBUG))<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + va_list args;<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + VAPrintf(format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>><br>
> > > > >>> @@ -197,15 +175,15 @@ Log::Debug (const char *format, ...)<br>
> > > > >>> // a non-zero value.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::DebugVerbose (const char *format, ...)<br>
> > > > >>> +Log::DebugVerbose(const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - if (GetOptions().AllSet (LLDB_LOG_OPTION_DEBUG | LLDB_LOG_OPTION_VERBOSE))<br>
> > > > >>> - {<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - PrintfWithFlagsVarArg (LLDB_LOG_FLAG_DEBUG | LLDB_LOG_FLAG_VERBOSE, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> - }<br>
> > > > >>> + if (!GetOptions().AllSet(LLDB_LOG_OPTION_DEBUG | LLDB_LOG_OPTION_VERBOSE))<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + va_list args;<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + VAPrintf(format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>><br>
> > > > >>> @@ -213,34 +191,34 @@ Log::DebugVerbose (const char *format, .<br>
> > > > >>> // Log only if all of the bits are set<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::LogIf (uint32_t bits, const char *format, ...)<br>
> > > > >>> +Log::LogIf(uint32_t bits, const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - if (m_options.AllSet (bits))<br>
> > > > >>> - {<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - PrintfWithFlagsVarArg (0, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> - }<br>
> > > > >>> + if (!m_options.AllSet(bits))<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + va_list args;<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + VAPrintf(format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> // Printing of errors that are not fatal.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::Error (const char *format, ...)<br>
> > > > >>> +Log::Error(const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - char *arg_msg = NULL;<br>
> > > > >>> + char *arg_msg = nullptr;<br>
> > > > >>> va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - ::vasprintf (&arg_msg, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + ::vasprintf(&arg_msg, format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>><br>
> > > > >>> - if (arg_msg != NULL)<br>
> > > > >>> - {<br>
> > > > >>> - PrintfWithFlags (LLDB_LOG_FLAG_ERROR, "error: %s", arg_msg);<br>
> > > > >>> - free (arg_msg);<br>
> > > > >>> - }<br>
> > > > >>> + if (arg_msg == nullptr)<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + VAPrintf("error: %s", arg_msg);<br>
> > > > >>> + free(arg_msg);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> @@ -248,20 +226,20 @@ Log::Error (const char *format, ...)<br>
> > > > >>> // immediately.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::FatalError (int err, const char *format, ...)<br>
> > > > >>> +Log::FatalError(int err, const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - char *arg_msg = NULL;<br>
> > > > >>> + char *arg_msg = nullptr;<br>
> > > > >>> va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - ::vasprintf (&arg_msg, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + ::vasprintf(&arg_msg, format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>><br>
> > > > >>> - if (arg_msg != NULL)<br>
> > > > >>> + if (arg_msg != nullptr)<br>
> > > > >>> {<br>
> > > > >>> - PrintfWithFlags (LLDB_LOG_FLAG_ERROR | LLDB_LOG_FLAG_FATAL, "error: %s", arg_msg);<br>
> > > > >>> - ::free (arg_msg);<br>
> > > > >>> + VAPrintf("error: %s", arg_msg);<br>
> > > > >>> + ::free(arg_msg);<br>
> > > > >>> }<br>
> > > > >>> - ::exit (err);<br>
> > > > >>> + ::exit(err);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>><br>
> > > > >>> @@ -270,15 +248,15 @@ Log::FatalError (int err, const char *fo<br>
> > > > >>> // enabled.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::Verbose (const char *format, ...)<br>
> > > > >>> +Log::Verbose(const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - if (m_options.Test(LLDB_LOG_OPTION_VERBOSE))<br>
> > > > >>> - {<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - PrintfWithFlagsVarArg (LLDB_LOG_FLAG_VERBOSE, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> - }<br>
> > > > >>> + if (!m_options.Test(LLDB_LOG_OPTION_VERBOSE))<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + va_list args;<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + VAPrintf(format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> @@ -286,40 +264,40 @@ Log::Verbose (const char *format, ...)<br>
> > > > >>> // enabled.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::WarningVerbose (const char *format, ...)<br>
> > > > >>> +Log::WarningVerbose(const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - if (m_options.Test(LLDB_LOG_OPTION_VERBOSE))<br>
> > > > >>> - {<br>
> > > > >>> - char *arg_msg = NULL;<br>
> > > > >>> - va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - ::vasprintf (&arg_msg, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> + if (!m_options.Test(LLDB_LOG_OPTION_VERBOSE))<br>
> > > > >>> + return;<br>
> > > > >>><br>
> > > > >>> - if (arg_msg != NULL)<br>
> > > > >>> - {<br>
> > > > >>> - PrintfWithFlags (LLDB_LOG_FLAG_WARNING | LLDB_LOG_FLAG_VERBOSE, "warning: %s", arg_msg);<br>
> > > > >>> - free (arg_msg);<br>
> > > > >>> - }<br>
> > > > >>> - }<br>
> > > > >>> + char *arg_msg = nullptr;<br>
> > > > >>> + va_list args;<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + ::vasprintf(&arg_msg, format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>> +<br>
> > > > >>> + if (arg_msg == nullptr)<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + VAPrintf("warning: %s", arg_msg);<br>
> > > > >>> + free(arg_msg);<br>
> > > > >>> }<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> // Printing of warnings that are not fatal.<br>
> > > > >>> //----------------------------------------------------------------------<br>
> > > > >>> void<br>
> > > > >>> -Log::Warning (const char *format, ...)<br>
> > > > >>> +Log::Warning(const char *format, ...)<br>
> > > > >>> {<br>
> > > > >>> - char *arg_msg = NULL;<br>
> > > > >>> + char *arg_msg = nullptr;<br>
> > > > >>> va_list args;<br>
> > > > >>> - va_start (args, format);<br>
> > > > >>> - ::vasprintf (&arg_msg, format, args);<br>
> > > > >>> - va_end (args);<br>
> > > > >>> + va_start(args, format);<br>
> > > > >>> + ::vasprintf(&arg_msg, format, args);<br>
> > > > >>> + va_end(args);<br>
> > > > >>><br>
> > > > >>> - if (arg_msg != NULL)<br>
> > > > >>> - {<br>
> > > > >>> - PrintfWithFlags (LLDB_LOG_FLAG_WARNING, "warning: %s", arg_msg);<br>
> > > > >>> - free (arg_msg);<br>
> > > > >>> - }<br>
> > > > >>> + if (arg_msg == nullptr)<br>
> > > > >>> + return;<br>
> > > > >>> +<br>
> > > > >>> + VAPrintf("warning: %s", arg_msg);<br>
> > > > >>> + free(arg_msg);<br>
> > > > >>> }<br>
> > > > >>><br>
> > > > >>> typedef std::map <ConstString, Log::Callbacks> CallbackMap;<br>
> > > > >>><br>
> > > > >>> Added: lldb/trunk/source/Core/NullLog.cpp<br>
> > > > >>> URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/NullLog.cpp?rev=236174&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/NullLog.cpp?rev=236174&view=auto</a><br>
> > > > >>> ==============================================================================<br>
> > > > >>> --- lldb/trunk/source/Core/NullLog.cpp (added)<br>
> > > > >>> +++ lldb/trunk/source/Core/NullLog.cpp Wed Apr 29 17:55:28 2015<br>
> > > > >>> @@ -0,0 +1,74 @@<br>
> > > > >>> +//===-- NullLog.cpp ---------------------------------------------*- C++ -*-===//<br>
> > > > >>> +//<br>
> > > > >>> +// The LLVM Compiler Infrastructure<br>
> > > > >>> +//<br>
> > > > >>> +// This file is distributed under the University of Illinois Open Source<br>
> > > > >>> +// License. See LICENSE.TXT for details.<br>
> > > > >>> +//<br>
> > > > >>> +//===----------------------------------------------------------------------===//<br>
> > > > >>> +<br>
> > > > >>> +#include "lldb/Core/NullLog.h"<br>
> > > > >>> +<br>
> > > > >>> +using namespace lldb_private;<br>
> > > > >>> +<br>
> > > > >>> +NullLog::NullLog()<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +NullLog::~NullLog()<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::PutCString(const char *cstr)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::Printf(const char *format, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::VAPrintf(const char *format, va_list args)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::LogIf(uint32_t mask, const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::Debug(const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::DebugVerbose(const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::Error(const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::FatalError(int err, const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::Verbose(const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::Warning(const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>> +<br>
> > > > >>> +void<br>
> > > > >>> +NullLog::WarningVerbose(const char *fmt, ...)<br>
> > > > >>> +{<br>
> > > > >>> +}<br>
> > > > >>><br>
> > > > >>><br>
> > > > >>> _______________________________________________<br>
> > > > >>> lldb-commits mailing list<br>
> > > > >>> <a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
> > > > >>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
> > > > >><br>
> > > > >><br>
> > > > >> _______________________________________________<br>
> > > > >> lldb-commits mailing list<br>
> > > > >> <a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
> > > > >> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
> > > > ><br>
> > > > ><br>
> > > > > _______________________________________________<br>
> > > > > lldb-commits mailing list<br>
> > > > > <a href="mailto:lldb-commits@cs.uiuc.edu" target="_blank">lldb-commits@cs.uiuc.edu</a><br>
> > > > > <a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
> > > > ><br>
> > > > > Thanks,<br>
> > > > > - Enrico<br>
> > > > > 📩 egranata@.com <img goomoji="260e" style="margin:0 0.2ex;vertical-align:middle;max-height:24px" alt="☎" src="cid:260e@goomoji.gmail">️ 27683<br>
> > > > ><br>
> > > ><br>
> > ><br>
> ><br>
><br>
<br>
</blockquote></div>
</div></div><br>_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
<br></blockquote></div><br></div>