[myserver-commit] [2759] Code refactoring: removed some global definitions

[Giuseppe Scrivano]

Revision: 2759
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2759
Author:   gscrivano
Date:     2008-08-24 19:47:09 +0000 (Sun, 24 Aug 2008)

Log Message:
-----------
Code refactoring: removed some global definitions

Modified Paths:
--------------
    trunk/myserver/include/server.h
    trunk/myserver/src/server.cpp
    trunk/myserver/stdafx.h

Modified: trunk/myserver/include/server.h
===================================================================
--- trunk/myserver/include/server.h     2008-08-23 19:13:02 UTC (rev 2758)
+++ trunk/myserver/include/server.h     2008-08-24 19:47:09 UTC (rev 2759)
@@ -241,6 +241,7 @@
        GenericPluginsManager genericPluginsManager;
        ProcessServerManager processServerManager;
        ConnectionsScheduler connectionsScheduler;
+  bool endServer;
 };
 
 #endif

Modified: trunk/myserver/src/server.cpp
===================================================================
--- trunk/myserver/src/server.cpp       2008-08-23 19:13:02 UTC (rev 2758)
+++ trunk/myserver/src/server.cpp       2008-08-24 19:47:09 UTC (rev 2759)
@@ -277,10 +277,10 @@
 
     /*
      *Keep thread alive.
-     *When the mustEndServer flag is set to True exit
+     *When the endServer flag is set to True exit
      *from the loop and terminate the server execution.
      */
-    while(!mustEndServer)
+    while(!endServer)
     {
       Thread::wait(100000);
 
@@ -556,7 +556,7 @@
  */
 void Server::stop()
 {
-  mustEndServer = 1;
+  endServer = true;
 }
 
 /*!
@@ -720,7 +720,7 @@
   currentThreadID = 0;
   freeThreads = 0;
   connectionTimeout = MYSERVER_SEC(25);
-  mustEndServer = 0;
+  endServer = false;
   verbosity = 1;
   purgeThreadsThreshold = 1;
   throttlingRate = 0;
@@ -1897,14 +1897,16 @@
   logWriteln("Rebooting...");
   if(mustEndServer)
     return 0;
-  mustEndServer = 1;
 
+  mustEndServer = true;
+
   ret = terminate();
   if(ret)
     return ret;
-  mustEndServer = 0;
 
+  mustEndServer = false;
 
+
   rebooting = 0;
 
   ret = initialize(0);

Modified: trunk/myserver/stdafx.h
===================================================================
--- trunk/myserver/stdafx.h     2008-08-23 19:13:02 UTC (rev 2758)
+++ trunk/myserver/stdafx.h     2008-08-24 19:47:09 UTC (rev 2759)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -71,10 +71,6 @@
 #define HOST_NAME_MAX 255
 #endif
 
-#ifndef MAXIMUM_PROCESSORS
-#define MAXIMUM_PROCESSORS 255
-#endif
-
 #define USE_NEW
 
 typedef unsigned long DWORD;
@@ -84,9 +80,7 @@
 typedef unsigned char u_char;
 
 typedef void* HANDLE;
-extern class Server *lserver;
 extern const char *versionOfSoftware;
-extern int mustEndServer;
 
 #ifndef SOCKET_ERROR
 #define SOCKET_ERROR -1