From 1467c99bcbf3d64c4a96313fbc867108de9e9588 Mon Sep 17 00:00:00 2001 From: sageweil Date: Wed, 10 Oct 2007 16:19:22 +0000 Subject: [PATCH] fixed uninit var bug git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1909 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/mds/msg/SimpleMessenger.cc | 15 ++------------- branches/sage/mds/msg/SimpleMessenger.h | 12 ++++++++++-- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/branches/sage/mds/msg/SimpleMessenger.cc b/branches/sage/mds/msg/SimpleMessenger.cc index 116204e245fc8..4b94297559315 100644 --- a/branches/sage/mds/msg/SimpleMessenger.cc +++ b/branches/sage/mds/msg/SimpleMessenger.cc @@ -168,8 +168,10 @@ int Rank::Accepter::start() // set a harmless handle for SIGUSR1 (we'll use it to stop the accepter) struct sigaction sa; + memset(&sa, 0, sizeof(sa)); sa.sa_handler = noop_signal_handler; sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); sigaction(SIGUSR1, &sa, NULL); // start thread @@ -1209,19 +1211,6 @@ void Rank::wait() * EntityMessenger */ -Rank::EntityMessenger::EntityMessenger(entity_name_t myaddr) : - Messenger(myaddr), - stop(false), - dispatch_thread(this) -{ -} -Rank::EntityMessenger::~EntityMessenger() -{ - // join dispatch thread - if (dispatch_thread.is_started()) - dispatch_thread.join(); -} - void Rank::EntityMessenger::dispatch_entry() { lock.Lock(); diff --git a/branches/sage/mds/msg/SimpleMessenger.h b/branches/sage/mds/msg/SimpleMessenger.h index 3457952e73de1..6bd417adc8e10 100644 --- a/branches/sage/mds/msg/SimpleMessenger.h +++ b/branches/sage/mds/msg/SimpleMessenger.h @@ -197,8 +197,16 @@ private: } public: - EntityMessenger(entity_name_t myaddr); - ~EntityMessenger(); + EntityMessenger(entity_name_t myaddr) : + Messenger(myaddr), + stop(false), + qlen(0), pqlen(0), + dispatch_thread(this) { } + ~EntityMessenger() { + // join dispatch thread + if (dispatch_thread.is_started()) + dispatch_thread.join(); + } void ready(); bool is_stopped() { return stop; } -- 2.39.5