diff options
| -rw-r--r-- | lib/Plugins/CCpp.cpp | 5 | ||||
| -rw-r--r-- | src/Daemon/CommLayerServer.h | 1 | ||||
| -rw-r--r-- | src/Daemon/CommLayerServerDBus.cpp | 12 | ||||
| -rw-r--r-- | src/Daemon/CommLayerServerDBus.h | 1 | ||||
| -rw-r--r-- | src/Daemon/CommLayerServerSocket.h | 1 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.cpp | 2 | ||||
| -rw-r--r-- | src/Daemon/Daemon.cpp | 10 |
7 files changed, 7 insertions, 25 deletions
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index a2665ed..48f452a 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -357,6 +357,7 @@ static void InstallDebugInfos(const std::string& pDebugDumpDir) log("Builting list of missing debuginfos"); // lines look like this: + // 0x400000+0x209000 23c77451cf6adff77fc1f5ee2a01d75de6511dda@0x40024c - - [exe] // 0x400000+0x209000 ab3c8286aac6c043fd1bb1cc2a0b88ec29517d3e@0x40024c /bin/sleep /usr/lib/debug/bin/sleep.debug [exe] // 0x7fff313ff000+0x1000 389c7475e3d5401c55953a425a2042ef62c4c7df@0x7fff313ff2f8 . - linux-vdso.so.1 vector_string_t missing; @@ -374,8 +375,10 @@ static void InstallDebugInfos(const std::string& pDebugDumpDir) char* endsp = strchr(word2, ' '); if (!endsp) continue; + /* endsp points to 2nd space in the line now*/ + /* This filters out linux-vdso.so, among others */ - if (endsp[1] != '/') + if (strstr(endsp, "[exe]") == NULL && endsp[1] != '/') continue; *endsp = '\0'; char* at = strchrnul(word2, '@'); diff --git a/src/Daemon/CommLayerServer.h b/src/Daemon/CommLayerServer.h index aface8a..6ede581 100644 --- a/src/Daemon/CommLayerServer.h +++ b/src/Daemon/CommLayerServer.h @@ -15,7 +15,6 @@ class CCommLayerServer { /* just stubs to be called when not implemented in specific comm layer */ virtual void Crash(const std::string& progname, const std::string& uid) {} virtual void JobDone(const char* pDest, const char* pUUID) = 0; - virtual void JobStarted(const char* pDest) {}; virtual void QuotaExceed(const char* str) {} virtual void Update(const std::string& pMessage, const char* peer, uint64_t pJobID) {}; diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index 35d2944..fc28a12 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -69,18 +69,6 @@ void CCommLayerServerDBus::QuotaExceed(const char* str) send_flush_and_unref(msg); } -void CCommLayerServerDBus::JobStarted(const char* peer) -{ - DBusMessage* msg = new_signal_msg("JobStarted", peer); - uint64_t nJobID = uint64_t(pthread_self()); - dbus_message_append_args(msg, - DBUS_TYPE_STRING, &peer, /* TODO: redundant parameter, remove from API */ - DBUS_TYPE_UINT64, &nJobID, /* TODO: redundant parameter, remove from API */ - DBUS_TYPE_INVALID); - VERB2 log("Sending signal JobStarted('%s',%llx)", peer, (unsigned long long)nJobID); - send_flush_and_unref(msg); -} - void CCommLayerServerDBus::JobDone(const char* peer, const char* pUUID) { DBusMessage* msg = new_signal_msg("JobDone", peer); diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h index 06fb15d..7b2e31d 100644 --- a/src/Daemon/CommLayerServerDBus.h +++ b/src/Daemon/CommLayerServerDBus.h @@ -12,7 +12,6 @@ class CCommLayerServerDBus /* DBus signal senders */ virtual void Crash(const std::string& progname, const std::string& uid); - virtual void JobStarted(const char* pDest); virtual void JobDone(const char* pDest, const char* pUUID); virtual void QuotaExceed(const char* str); diff --git a/src/Daemon/CommLayerServerSocket.h b/src/Daemon/CommLayerServerSocket.h index f598841..baca195 100644 --- a/src/Daemon/CommLayerServerSocket.h +++ b/src/Daemon/CommLayerServerSocket.h @@ -31,5 +31,4 @@ class CCommLayerServerSocket : public CCommLayerServer virtual bool DeleteDebugDump(const std::string& pUUID, const std::string& pSender); virtual void Crash(const std::string& arg1); - virtual void JobStarted(const char* pDest) {}; }; diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 6093646..94fb9d7 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -151,8 +151,6 @@ static void* create_report(void* arg) { thread_data_t *thread_data = (thread_data_t *) arg; - g_pCommLayer->JobStarted(thread_data->peer); - /* Client name is per-thread, need to set it */ set_client_name(thread_data->peer); diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 05c5f0b..cea0c15 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -52,8 +52,7 @@ * v[N]["executable"/"uid"/"kernel"/"backtrace"][N] = "contents" * - CreateReport(UUID,force): starts creating a report for /var/cache/abrt/DIR with this UUID. * Returns job id (uint64). - * Emits JobStarted(client_dbus_ID,job_id) dbus signal. - * After it returns, when report creation thread has finished, + * After thread returns, when report creation thread has finished, * JobDone(client_dbus_ID,UUID) dbus signal is emitted. * - GetJobResult(UUID): returns map_crash_report_t (map_vector_string_t) * - Report(map_crash_report_t (map_vector_string_t[, map_map_string_t])): @@ -71,8 +70,6 @@ * * DBus signals we emit: * - Crash(progname,uid) - a new crash occurred (new /var/cache/abrt/DIR is found) - * - JobStarted(client_dbus_ID,job_id) - see CreateReport above. - * Sent as unicast to the client which did CreateReport. * - JobDone(client_dbus_ID,UUID) - see CreateReport above. * Sent as unicast to the client which did CreateReport. * - Warning(msg,job_id) @@ -81,9 +78,8 @@ * If set_client_name(NULL) was done, they are not sent. * * TODO: - * - API does not really need JobStarted dbus signal at all, and JobDone signal - * does not need to pass any parameters - out clients never send multiple - * CreateReport's. + * - JobDone signal does not need to pass any parameters + * - our clients never send multiple CreateReport's. */ |