From 41c66a2fba34a111e626e5cd6558101335c43527 Mon Sep 17 00:00:00 2001 From: sage Date: Tue, 3 May 2005 18:23:54 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@199 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/msg/CheesySerializer.cc | 2 +- ceph/msg/FakeMessenger.cc | 14 ++++++++++---- ceph/msg/FakeMessenger.h | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ceph/msg/CheesySerializer.cc b/ceph/msg/CheesySerializer.cc index 7e9063118b356..0e0e16256b24b 100644 --- a/ceph/msg/CheesySerializer.cc +++ b/ceph/msg/CheesySerializer.cc @@ -10,7 +10,7 @@ using namespace std; #undef dout #define dout(l) if (l<=g_conf.debug) cout << "serializer: " -#define DEBUGLVL 13 // debug level of output +#define DEBUGLVL 1 // debug level of output // --------- // incoming messages diff --git a/ceph/msg/FakeMessenger.cc b/ceph/msg/FakeMessenger.cc index ab5120ccc4894..13a28c729279f 100644 --- a/ceph/msg/FakeMessenger.cc +++ b/ceph/msg/FakeMessenger.cc @@ -52,9 +52,7 @@ void *fakemessenger_thread(void *ptr) dout(1) << "thread woke up" << endl; if (shutdown) break; - lock.Unlock(); - fakemessenger_do_loop(); - lock.Lock(); + fakemessenger_do_loop_2(); } lock.Unlock(); @@ -86,6 +84,14 @@ void fakemessenger_stopthread() { int fakemessenger_do_loop() { lock.Lock(); + fakemessenger_do_loop_2(); + lock.Unlock(); +} + + +int fakemessenger_do_loop_2() +{ + //lock.Lock(); dout(1) << "do_loop begin." << endl; while (1) { @@ -136,7 +142,7 @@ int fakemessenger_do_loop() } dout(1) << "do_loop end (no more messages)." << endl; - lock.Unlock(); + //lock.Unlock(); return 0; } diff --git a/ceph/msg/FakeMessenger.h b/ceph/msg/FakeMessenger.h index e455b98ec5232..4241eb6be1b44 100644 --- a/ceph/msg/FakeMessenger.h +++ b/ceph/msg/FakeMessenger.h @@ -28,6 +28,7 @@ class FakeMessenger : public Messenger { }; int fakemessenger_do_loop(); +int fakemessenger_do_loop_2(); void fakemessenger_startthread(); void fakemessenger_stopthread(); -- 2.39.5