From 5bf3512df0529960ed4980251825b49a12eff894 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 25 Aug 2009 12:57:46 +0200 Subject: pass map_crash_report_t by const reference, not by value Signed-off-by: Denys Vlasenko --- src/Daemon/CommLayerServerDBus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Daemon/CommLayerServerDBus.h') diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index ad245061..c335b6f2 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -26,7 +26,7 @@ class CCommLayerServerDBus return retval; } virtual uint64_t CreateReport_t(const std::string& pUUID, const std::string& pSender); - virtual report_status_t Report(map_crash_report_t pReport,const std::string& pSender); + virtual report_status_t Report(const map_crash_report_t& pReport, const std::string& pSender); virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pSender); virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pSender); virtual vector_map_string_string_t GetPluginsInfo(); @@ -36,7 +36,7 @@ class CCommLayerServerDBus void UnRegisterPlugin(const std::string& pName); virtual void Crash(const std::string& arg1); - virtual void AnalyzeComplete(map_crash_report_t arg1); + virtual void AnalyzeComplete(const map_crash_report_t& arg1); virtual void Error(const std::string& arg1); virtual void Update(const std::string& pDest, const std::string& pMessage); virtual void JobDone(const std::string& pDest, uint64_t pJobID); -- cgit From 3008b32dd0f78b0b2c09e05a7b47080c7cb75d38 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 25 Aug 2009 14:00:22 +0200 Subject: remove CreateReport() method from server machinery; add comments about DBus Signed-off-by: Denys Vlasenko --- src/Daemon/CommLayerServerDBus.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/Daemon/CommLayerServerDBus.h') diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index c335b6f2..18e71f90 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -18,23 +18,21 @@ class CCommLayerServerDBus CCommLayerServerDBus(); virtual ~CCommLayerServerDBus(); + /* DBus call handlers */ virtual vector_crash_infos_t GetCrashInfos(const std::string& pSender); - /*FIXME: fix CLI and remove this stub*/ - virtual map_crash_report_t CreateReport(const std::string& pUUID, const std::string& pSender) - { - map_crash_report_t retval; - return retval; - } virtual uint64_t CreateReport_t(const std::string& pUUID, const std::string& pSender); virtual report_status_t Report(const map_crash_report_t& pReport, const std::string& pSender); virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pSender); virtual map_crash_report_t GetJobResult(uint64_t pJobID, const std::string& pSender); virtual vector_map_string_string_t GetPluginsInfo(); virtual map_plugin_settings_t GetPluginSettings(const std::string& pName, const std::string& pSender); - void SetPluginSettings(const std::string& pName, const std::string& pSender, const map_plugin_settings_t& pSettings); - void RegisterPlugin(const std::string& pName); - void UnRegisterPlugin(const std::string& pName); + virtual void SetPluginSettings(const std::string& pName, const std::string& pSender, const map_plugin_settings_t& pSettings); + virtual void RegisterPlugin(const std::string& pName); + virtual void UnRegisterPlugin(const std::string& pName); + /* Double duty: */ + /* (1) implement CCommLayerServer's virtuals */ + /* (2) propagate values to CDBusServer_adaptor::() in order to send a DBus signal */ virtual void Crash(const std::string& arg1); virtual void AnalyzeComplete(const map_crash_report_t& arg1); virtual void Error(const std::string& arg1); -- cgit From facd7083bc1c5f097b7d6795780670644ccfbb1f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 25 Aug 2009 15:31:42 +0200 Subject: eliminate one-use class CDBusServer_adaptor Signed-off-by: Denys Vlasenko --- src/Daemon/CommLayerServerDBus.h | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'src/Daemon/CommLayerServerDBus.h') diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index 18e71f90..bbc0c3d1 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -1,24 +1,39 @@ -#include "CommLayerServer.h" +#ifndef COMMLAYERSERVERDBUS_H_ +#define COMMLAYERSERVERDBUS_H_ #include #include -#include "DBusServerProxy.h" -#include +#include "CommLayerServer.h" class CCommLayerServerDBus : public CCommLayerServer, - public CDBusServer_adaptor, - public DBus::IntrospectableAdaptor, + public DBus::InterfaceAdaptor, +// public DBus::IntrospectableAdaptor, public DBus::ObjectAdaptor { private: DBus::Connection *m_pConn; static DBus::Connection *init_dbus(CCommLayerServerDBus *self); + public: CCommLayerServerDBus(); virtual ~CCommLayerServerDBus(); /* DBus call handlers */ + private: + /* unmarshalers */ + DBus::Message _GetCrashInfos_stub(const DBus::CallMessage &call); + DBus::Message _CreateReport_stub(const DBus::CallMessage &call); + DBus::Message _Report_stub(const DBus::CallMessage &call); + DBus::Message _DeleteDebugDump_stub(const DBus::CallMessage &call); + DBus::Message _GetJobResult_stub(const DBus::CallMessage &call); + DBus::Message _GetPluginsInfo_stub(const DBus::CallMessage &call); + DBus::Message _GetPluginSettings_stub(const DBus::CallMessage &call); + DBus::Message _SetPluginSettings_stub(const DBus::CallMessage &call); + DBus::Message _RegisterPlugin_stub(const DBus::CallMessage &call); + DBus::Message _UnRegisterPlugin_stub(const DBus::CallMessage &call); + public: + /* handlers */ virtual vector_crash_infos_t GetCrashInfos(const std::string& pSender); virtual uint64_t CreateReport_t(const std::string& pUUID, const std::string& pSender); virtual report_status_t Report(const map_crash_report_t& pReport, const std::string& pSender); @@ -30,15 +45,14 @@ class CCommLayerServerDBus virtual void RegisterPlugin(const std::string& pName); virtual void UnRegisterPlugin(const std::string& pName); - /* Double duty: */ - /* (1) implement CCommLayerServer's virtuals */ - /* (2) propagate values to CDBusServer_adaptor::() in order to send a DBus signal */ + /* DBus signal senders */ + public: virtual void Crash(const std::string& arg1); virtual void AnalyzeComplete(const map_crash_report_t& arg1); virtual void Error(const std::string& arg1); virtual void Update(const std::string& pDest, const std::string& pMessage); virtual void JobDone(const std::string& pDest, uint64_t pJobID); - virtual void Warning(const std::string& pDest, const std::string& pMessage); + virtual void Warning(const std::string& pMessage); }; /* @@ -46,3 +60,5 @@ class CCommLayerServerDBus * (otherwise "new DBus::Connection(DBus::Connection::SystemBus())" fails) */ void attach_dbus_dispatcher_to_glib_main_context(); + +#endif -- cgit