From: Sage Weil <sage@newdream.net>
Date: Tue, 3 Mar 2009 00:56:45 +0000 (-0800)
Subject: config: remove 'debug_after' cruft
X-Git-Tag: v0.7~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c99ecb93650228beca2015d8faa70270b0090d08;p=ceph.git

config: remove 'debug_after' cruft
---

diff --git a/src/config.cc b/src/config.cc
index 1691cfd228e..8ea7c1d9bdb 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -184,7 +184,6 @@ std::map<entity_name_t,float> g_fake_kill_after;
 
 entity_addr_t g_my_addr;
 
-md_config_t g_debug_after_conf;
 md_config_t g_conf;
 
 #include <stdlib.h>
@@ -382,7 +381,6 @@ static struct config_option config_optionsp[] = {
 	OPTION(debug, debug_mon, 0, INT, 1),
 	OPTION(debug, debug_paxos, 0, INT, 0),
 	OPTION(debug, debug_tp, 0, INT, 0),
-	OPTION(debug, debug_after, 0, INT, 0),
 	OPTION(clock, clock_lock, 0, BOOL, false),
 	OPTION(clock, clock_tare, 0, BOOL, false),
 	OPTION(global, ms_tcp_nodelay, 0, BOOL, true),
diff --git a/src/config.h b/src/config.h
index 28e4801f2fe..f6a8a760319 100644
--- a/src/config.h
+++ b/src/config.h
@@ -99,8 +99,6 @@ struct md_config_t {
   int debug_paxos;
   int debug_tp;
 
-  int debug_after;
-
   // clock
   bool clock_lock;
   bool clock_tare;
@@ -339,7 +337,6 @@ struct md_config_t {
 };
 
 extern md_config_t g_conf;     
-extern md_config_t g_debug_after_conf;     
 
 
 
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index aee08cc8ad6..497b60a8051 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -327,16 +327,6 @@ public:
   }
 };
 
-class C_Debug : public Context {
-  public:
-  void finish(int) {
-    int size = &g_conf.debug_after - &g_conf.debug;
-    memcpy((char*)&g_conf.debug, (char*)&g_debug_after_conf.debug, size);
-    dout(0) << "debug_after flipping debug settings" << dendl;
-  }
-};
-
-
 static void write_pid_file(int pid)
 {
   if (!g_conf.pid_file)
@@ -409,8 +399,6 @@ int Rank::start(bool nodaemon)
   // some debug hackery?
   if (g_conf.kill_after) 
     g_timer.add_event_after(g_conf.kill_after, new C_Die);
-  if (g_conf.debug_after) 
-    g_timer.add_event_after(g_conf.debug_after, new C_Debug);
 
   // go!
   accepter.start();