[GNUnet-SVN] r7217 - gnunet-qt/src/plugins/stats

[gnunet]

Author: durner
Date: 2008-06-14 15:26:32 -0600 (Sat, 14 Jun 2008)
New Revision: 7217

Modified:
   gnunet-qt/src/plugins/stats/statsPlugin.cc
   gnunet-qt/src/plugins/stats/statsThread.cc
   gnunet-qt/src/plugins/stats/statsThread.h
Log:
improve shutdown procedure (Mantis #1355)

Modified: gnunet-qt/src/plugins/stats/statsPlugin.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsPlugin.cc  2008-06-14 21:13:27 UTC (rev 
7216)
+++ gnunet-qt/src/plugins/stats/statsPlugin.cc  2008-06-14 21:26:32 UTC (rev 
7217)
@@ -58,7 +58,7 @@
 GStatsPlugin::~GStatsPlugin()
 {
   statsThread->stop();
-  if (!statsThread->wait(200))
+  if (!statsThread->wait(1000))
     statsThread->terminate();
 
   delete statsThread;

Modified: gnunet-qt/src/plugins/stats/statsThread.cc
===================================================================
--- gnunet-qt/src/plugins/stats/statsThread.cc  2008-06-14 21:13:27 UTC (rev 
7216)
+++ gnunet-qt/src/plugins/stats/statsThread.cc  2008-06-14 21:26:32 UTC (rev 
7217)
@@ -41,14 +41,14 @@
 
 static int acquireStatistics(const char *name, unsigned long long value, void 
*param)
 {
-  ((GStatsThread *) param)->processStat(name, value);
-    
-  return GNUNET_OK;
+  return ((GStatsThread *) param)->processStat(name, value);
 }
 
-void GStatsThread::processStat(const char *name, unsigned long long value)
+bool GStatsThread::processStat(const char *name, unsigned long long value)
 {
    emit stat(name, value);
+   
+   return !stopSignalled;
 }
 
 void GStatsThread::run()

Modified: gnunet-qt/src/plugins/stats/statsThread.h
===================================================================
--- gnunet-qt/src/plugins/stats/statsThread.h   2008-06-14 21:13:27 UTC (rev 
7216)
+++ gnunet-qt/src/plugins/stats/statsThread.h   2008-06-14 21:26:32 UTC (rev 
7217)
@@ -38,7 +38,7 @@
   void run();
   void stop();
   
-  void processStat(const char *name, unsigned long long value);
+  bool processStat(const char *name, unsigned long long value);
   
 protected:
   struct GNUNET_GC_Configuration *config;