Initialize ProcessPOSIXLog by NativeProcessLinux

[tberghammer]

Summary

Initialize ProcessPOSIXLog by NativeProcessLinux

Previously it was initialized by ProcessLinux but lldb-server don't contain ProcessLinux anymore (since the separation of the dependencies) so it have to be initialized by NativeProcessLinux also.

[flackr]

Isn't this equivalent to calling ProcessLinux::Initialize in InitializeForLLGS?

[tberghammer]

No, it don't register the process linux plugin into the plugin manager.

[flackr]

In D8080#134963, @tberghammer wrote:

No, it don't register the process linux plugin into the plugin manager.

Ah of course, makes sense. Can we remove the common code from ProcessLinux and only register the plugin in ProcessLinux::Initialize or implicitly initialize NativeProcessLinux from ProcessLinux::Initialize?

[tberghammer]

We can, but ProcessPOSIXLog is a dependency for both of them, so I think it isn't a good idea.

If we want to reduce the amount of code duplication, then I would suggest to simplify the process of registering a log channel to just one function call (e.g.: create a ProcessPOSIXLog::RegisterLogger (const ConstString& name)) function.

[flackr]

In D8080#134977, @tberghammer wrote:

We can, but ProcessPOSIXLog is a dependency for both of them, so I think it isn't a good idea.

If we want to reduce the amount of code duplication, then I would suggest to simplify the process of registering a log channel to just one function call (e.g.: create a ProcessPOSIXLog::RegisterLogger (const ConstString& name)) function.

But lldb_private::Initialize initializes everything (i.e. calls lldb_private::InitializeForLLGS), I think it's reasonable to expect there are some inter-dependencies. That being said I'm fine with moving it to ProcessPOSIXLog::RegisterLogger as long as it doesn't matter that it will be called twice, just trying to reduce code duplication.

[tberghammer]

Move NativeProcessLinux::Initialize() call into lldb-gdbserver.cpp

[flackr]

lgtm

lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.h

namespace lldb_private
     /// Changes in the inferior process state are broadcasted.
     class NativeProcessLinux: public NativeProcessProtocol
     {
     public:
 
         // ---------------------------------------------------------------------
         // Public Static Methods
         // ---------------------------------------------------------------------
+        static void
+        Initialize();
+
         static lldb_private::Error
         LaunchProcess (
             Module *exe_module,
             ProcessLaunchInfo &launch_info,
             lldb_private::NativeProcessProtocol::NativeDelegate &native_delegate,
             NativeProcessProtocolSP &native_process_sp);
 
         static lldb_private::Error

lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp

 
 NativeProcessLinux::AttachArgs::~AttachArgs()
 { }
 
 // -----------------------------------------------------------------------------
 // Public Static Methods
 // -----------------------------------------------------------------------------
 
+void
+NativeProcessLinux::Initialize()
+{
+    static ConstString g_name("linux");
+    static bool g_initialized = false;
+
+    if (!g_initialized)
+    {
+        g_initialized = true;
+
+        Log::Callbacks log_callbacks = {
+            ProcessPOSIXLog::DisableLog,
+            ProcessPOSIXLog::EnableLog,
+            ProcessPOSIXLog::ListLogCategories
+        };
+
+        Log::RegisterLogChannel (g_name, log_callbacks);
+        ProcessPOSIXLog::RegisterPluginName (g_name);
+    }
+}
+
 lldb_private::Error
 NativeProcessLinux::LaunchProcess (
     lldb_private::Module *exe_module,
     lldb_private::ProcessLaunchInfo &launch_info,
     lldb_private::NativeProcessProtocol::NativeDelegate &native_delegate,
     NativeProcessProtocolSP &native_process_sp)
 {
     Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS));

lldb/trunk/tools/lldb-server/lldb-gdbserver.cpp

 #include "lldb/Host/OptionParser.h"
 #include "lldb/Host/Socket.h"
 #include "lldb/Host/StringConvert.h"
 #include "lldb/Host/ThreadLauncher.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h"
 #include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
+#include "Plugins/Process/Linux/NativeProcessLinux.h"
 
 #ifndef LLGS_PROGRAM_NAME
 #define LLGS_PROGRAM_NAME "lldb-server"
 #endif
 
 #ifndef LLGS_VERSION_STR
 #define LLGS_VERSION_STR "local_build"
 #endif
ConnectToRemote (GDBRemoteCommunicationServerLLGS &gdb_server, bool reverse_connect, const char *const host_and_port, const char *const progname, const char *const subcommand, const char *const named_pipe_path)
     else
     {
         fprintf (stderr, "no connection information provided, unable to run\n");
         display_usage (progname, subcommand);
         exit (1);
     }
 }
 
-//----------------------------------------------------------------------
-// main
-//----------------------------------------------------------------------
-int
-main_gdbserver (int argc, char *argv[])
+static void
+initialize ()
 {
 #ifndef _WIN32
     // Setup signal handlers first thing.
     signal (SIGPIPE, signal_handler);
     signal (SIGHUP, signal_handler);
 #endif
 
+#if defined (__linux__)
+    //----------------------------------------------------------------------
+    // Linux hosted plugins
+    //----------------------------------------------------------------------
+    NativeProcessLinux::Initialize();
+#endif
+}
+
+//----------------------------------------------------------------------
+// main
+//----------------------------------------------------------------------
+int
+main_gdbserver (int argc, char *argv[])
+{
+    initialize ();
+
     const char *progname = argv[0];
     const char *subcommand = argv[1];
     argc--;
     argv++;
     int long_option_index = 0;
     StreamSP log_stream_sp;
     Args log_args;
     Error error;