Changeset 3b8eb61 in nscp

Timestamp:

05/18/05 22:46:09 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

7da80b5

Parents:

f896cfb

Message:

2005-05-18 MickeM

• Fixed bug in NSC.ini (section title for Check System was wrong) + Added multitasking for plugins (now two plugins can handle requests simultaniously)
• Fixed som minor issues here and there

Location:

trunk

Files:

• NSClient++.cpp (modified) (11 diffs)
• NSClient++.h (modified) (2 diffs)
• NSClient++.vcproj (modified) (1 diff)
• changelog (modified) (1 diff)
• docs/SysTray/index.html (added)
• include/EnumProcess.cpp (modified) (1 diff)
• include/MutexRW.h (added)
• include/PDHCounter.h (modified) (2 diffs)
• modules/CheckHelpers/CheckHelpers.cpp (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (6 diffs)
• modules/CheckSystem/PDHCollector.cpp (modified) (2 diffs)
• modules/CheckSystem/PDHCollector.h (modified) (1 diff)

trunk/NSClient++.cpp

@@ -174 +174 @@
  */
 void NSClientT::loadPlugins(const std::list<std::string> plugins) {
+  ReadLock readLock(&m_mutexRW, true, 10000);
+  if (!readLock.IsLocked()) {
+    LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+    return;
+  }
+  /*
   MutexLock lock(pluginMutex);
   if (!lock.hasMutex()) {
@@ -179 +185 @@
     return;
   }
+  */
   std::list<std::string>::const_iterator it;
   for (it = plugins.begin(); it != plugins.end(); ++it) {
@@ -188 +195 @@
  */
 void NSClientT::unloadPlugins() {
-  MutexLock lock(pluginMutex,20000);
-  if (!lock.hasMutex()) {
+  {
+    WriteLock writeLock(&m_mutexRW, true, 10000);
+    if (!writeLock.IsLocked()) {
+      LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+      return;
+    }
+    /*  MutexLock lock(pluginMutex,20000);
+    if (!lock.hasMutex()) {
     LOG_ERROR("FATAL ERROR: Could not get mutex.");
     return;
-  }
-  commandHandlers_.clear();
+    }
+    */
+    commandHandlers_.clear();
+    {
+      /*    MutexLock lock(messageMutex,20000);
+      if (!lock.hasMutex()) {
+      LOG_ERROR("FATAL ERROR: Could not get mutex (we will now crash BTW).");
+      } else {
+      messageHandlers_.clear();
+      }
+      */
+      messageHandlers_.clear();
+    }
+  }
   {
-    MutexLock lock2(messageMutex,20000);
-    if (!lock2.hasMutex()) {
-      LOG_ERROR("FATAL ERROR: Could not get mutex (we will now crash BTW).");
-    } else {
-      messageHandlers_.clear();
-    }
-  }
-  for (pluginList::size_type i=plugins_.size();i>0;i--) {
-    NSCPlugin *p = plugins_[i-1];
-    LOG_DEBUG_STD("Unloading plugin: " + p->getName() + "...");
-    p->unload();
-  }
-
-  for (unsigned int i=plugins_.size();i>0;i--) {
-    NSCPlugin *p = plugins_[i-1];
-    plugins_[i-1] = NULL;
-    delete p;
-  }
-  plugins_.clear();
+    ReadLock readLock(&m_mutexRW, true, 10000);
+    if (!readLock.IsLocked()) {
+      LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+      return;
+    }
+    for (pluginList::size_type i=plugins_.size();i>0;i--) {
+      NSCPlugin *p = plugins_[i-1];
+      LOG_DEBUG_STD("Unloading plugin: " + p->getName() + "...");
+      p->unload();
+    }
+  }
+
+  {
+    WriteLock writeLock(&m_mutexRW, true, 10000);
+    if (!writeLock.IsLocked()) {
+      LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+      return;
+    }
+    for (unsigned int i=plugins_.size();i>0;i--) {
+      NSCPlugin *p = plugins_[i-1];
+      plugins_[i-1] = NULL;
+      delete p;
+    }
+    plugins_.clear();
+  }
 }
 /**
@@ -220 +251 @@
  */
 void NSClientT::loadPlugin(const std::string file) {
+  LOG_DEBUG_STD("Loading: " + file);
   addPlugin(new NSCPlugin(file));
 }
@@ -227 +259 @@
  */
 void NSClientT::addPlugin(plugin_type plugin) {
+  {
+    ReadLock readLock(&m_mutexRW, true, 5000);
+    if (!readLock.IsLocked()) {
+      LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+      return;
+    }
+    plugin->load();
+  }
+  /*
   MutexLock lock(pluginMutex);
   if (!lock.hasMutex()) {
@@ -232 +273 @@
     return;
   }
-  plugin->load();
-  LOG_DEBUG_STD("Loading: " + plugin->getName());
-  // @todo Catch here and unload if we fail perhaps ?
-  plugins_.insert(plugins_.end(), plugin);
-  if (plugin->hasCommandHandler())
-    commandHandlers_.insert(commandHandlers_.end(), plugin);
-  if (plugin->hasMessageHandler())
-    messageHandlers_.insert(messageHandlers_.end(), plugin);
+  */
+
+  {
+    WriteLock writeLock(&m_mutexRW, true, 10000);
+    if (!writeLock.IsLocked()) {
+      LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+      return;
+    }
+    // @todo Catch here and unload if we fail perhaps ?
+    plugins_.insert(plugins_.end(), plugin);
+    if (plugin->hasCommandHandler())
+      commandHandlers_.insert(commandHandlers_.end(), plugin);
+    if (plugin->hasMessageHandler())
+      messageHandlers_.insert(messageHandlers_.end(), plugin);
+  }
+
 }
 
@@ -271 +320 @@
  */
 NSCAPI::nagiosReturn NSClientT::injectRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen) {
-  MutexLock lock(pluginMutex);
+  ReadLock readLock(&m_mutexRW, true, 5000);
+  if (!readLock.IsLocked()) {
+    LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
+    return NSCAPI::returnUNKNOWN;
+  }
+/*  MutexLock lock(pluginMutex);
   if (!lock.hasMutex()) {
     LOG_ERROR_STD("Failed to get mutex (" + strEx::itos(lock.getWaitResult()) + "), command ignored...");
     return NSCAPI::returnUNKNOWN;
   }
-
+*/
   for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) {
     try {
@@ -290 +344 @@
         case NSCAPI::returnCRIT:
         case NSCAPI::returnUNKNOWN:
-          LOG_DEBUG_STD("Injected Result: " +(std::string) returnMessageBuffer);
-          LOG_DEBUG_STD("Injected Performance Result: " +(std::string) returnPerfBuffer);
+//          LOG_DEBUG_STD("Injected Result: " +(std::string) returnMessageBuffer);
+//          LOG_DEBUG_STD("Injected Performance Result: " +(std::string) returnPerfBuffer);
           return c;
         default:
@@ -314 +368 @@
  */
 void NSClientT::reportMessage(int msgType, const char* file, const int line, std::string message) {
+  ReadLock readLock(&m_mutexRW, true, 5000);
+  if (!readLock.IsLocked()) {
+    std::cout << "Message was lost as the core was locked..." << std::endl;
+    return;
+  }
   MutexLock lock(messageMutex);
   if (!lock.hasMutex()) {
@@ -320 +379 @@
     return;
   }
+  /*
+  MutexLock lock(messageMutex);
+  if (!lock.hasMutex()) {
+    std::cout << "Message was lost as the core was locked..." << std::endl;
+    std::cout << message << std::endl;
+    return;
+  }
+  */
   if (g_bConsoleLog) {
     std::string k = "?";
@@ -364 +431 @@
 }
 std::string NSClientT::getBasePath(void) {
-  MutexLock lock(pluginMutex);
+  MutexLock lock(internalVariables);
   if (!lock.hasMutex()) {
     LOG_ERROR("FATAL ERROR: Could not get mutex.");

trunk/NSClient++.h

@@ -7 +7 @@
 #include <Mutex.h>
 #include <NSCAPI.h>
+#include <MutexRW.h>
 
 
@@ -42 +43 @@
   pluginList messageHandlers_;
   std::string basePath;
-  MutexHandler pluginMutex;
+  MutexHandler internalVariables;
+//  MutexHandler pluginMutex;
   MutexHandler messageMutex;
+  MutexRW  m_mutexRW;
 
 public:

trunk/NSClient++.vcproj

@@ -296 +296 @@
       </File>
       <File
+        RelativePath=".\include\MutexRW.h">
+      </File>
+      <File
         RelativePath=".\include\NSCAPI.h">
       </File>

trunk/changelog

@@ +1 @@
+2005-05-18 MickeM
+ * Fixed bug in NSC.ini (section title for Check System was wrong)
+ + Added multitasking for plugins (now two plugins can handle requests simultaniously)
+ * Fixed som minor issues here and there
+
 2005-05-15 MickeM
  + Added NRPE support for checkCounter

trunk/include/EnumProcess.cpp

@@ -5 +5 @@
 #include "stdafx.h"
 #include "EnumProcess.h"
-
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
 
 //////////////////////////////////////////////////////////////////////

trunk/include/PDHCounter.h

@@ -50 +50 @@
       PDH_STATUS status;
       assert(hQuery != NULL);
-      assert(hCounter_ == NULL);
+      if (hCounter_ != NULL)
+        throw PDHException("addToQuery failed (already opened): " + name_);
       if (listener_)
         listener_->attach(*this);
       if ((status = PdhAddCounter(hQuery, name_.c_str(), 0, &hCounter_)) != ERROR_SUCCESS) 
-        throw PDHException("PdhOpenQuery failed", status);
+        throw PDHException("PdhOpenQuery failed: " + name_, status);
       assert(hCounter_ != NULL);
     }
     void remove() {
-      assert(hCounter_ != NULL);
+      if (hCounter_ == NULL)
+        return;
       PDH_STATUS status;
       if (listener_)
@@ -67 +69 @@
     }
     void collect() {
-      assert(hCounter_ != NULL);
+      if (hCounter_ == NULL)
+        return;
       PDH_STATUS status;
       if ((status = PdhGetFormattedCounterValue(hCounter_, PDH_FMT_LARGE , NULL, &data_)) != ERROR_SUCCESS)

trunk/modules/CheckHelpers/CheckHelpers.cpp

@@ -103 +103 @@
     std::string tMsg, tPerf;
     NSCAPI::nagiosReturn tRet = NSCModuleHelper::InjectCommand((*cit2).first.c_str(), length, args, tMsg, tPerf);
+    arrayBuffer::destroyArrayBuffer(args, length);
     returnCode = NSCHelper::maxState(returnCode, tRet);
     if (!msg.empty())

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -48 +48 @@
 
   if (wantedMethod == C_SYSTEM_ENUMPROC_METHOD_PSAPI) {
+    NSC_DEBUG_MSG_STD("Using PSAPI method.");
     if (method == (method|ENUM_METHOD::PSAPI)) {
       processMethod_ = ENUM_METHOD::PSAPI;
     } else {
-      NSC_LOG_ERROR_STD("PSAPI method not avalible, check " C_SYSTEM_ENUMPROC_METHOD " option.");
+      NSC_LOG_ERROR_STD("PSAPI method not available, check " C_SYSTEM_ENUMPROC_METHOD " option.");
     }
   } else {
+    NSC_DEBUG_MSG_STD("Using TOOLHELP method.");
     if (method == (method|ENUM_METHOD::TOOLHELP)) {
       processMethod_ = ENUM_METHOD::TOOLHELP;
@@ -68 +70 @@
  */
 bool CheckSystem::unloadModule() {
-  if (!pdhThread.exitThread(20000))
+  if (!pdhThread.exitThread(20000)) {
+    std::cout << "MAJOR ERROR: Could not unload thread..." << std::endl;
     NSC_LOG_ERROR("Could not exit the thread, memory leak and potential corruption may be the result...");
+  }
   return true;
 }
@@ -168 +172 @@
   for (std::list<std::string>::iterator it = times.begin(); it != times.end(); ++it) {
     PDHCollector *pObject = pdhThread.getThread();
-    assert(pObject);
+    if (!pObject) {
+      msg = "ERROR: PDH Collection thread not running.";
+      return NSCAPI::returnUNKNOWN;
+    }
     if (bNSCLientCompatible) {
       int v = pObject->getCPUAvrage((*it) + "m");
@@ -233 +240 @@
   }
   PDHCollector *pObject = pdhThread.getThread();
-  assert(pObject);
+  if (!pObject) {
+    msg = "ERROR: PDH Collection thread not running.";
+    return NSCAPI::returnUNKNOWN;
+  }
   unsigned long long uptime = pObject->getUptime();
   if (bNSCLientCompatible) {
@@ -381 +391 @@
 
   PDHCollector *pObject = pdhThread.getThread();
-  assert(pObject);
+  if (!pObject) {
+    msg = "ERROR: PDH Collection thread not running.";
+    return NSCAPI::returnUNKNOWN;
+  }
   long long pageCommit = pObject->getMemCommit(); 
   long long pageCommitLimit = pObject->getMemCommitLimit(); 
@@ -567 +580 @@
 
   for (std::list<std::pair<std::string,std::string> >::iterator it = counters.begin(); it != counters.end(); ++it) {
+    std::string name;
     try {
-      try {
-        PDH::PDHQuery pdh;
-        PDHCollectors::StaticPDHCounterListener counter;
-        pdh.addCounter((*it).second, &counter);
-        pdh.open();
-        pdh.collect();
-        std::string name = (*it).first;
-        if (name.empty())
-          name = (*it).second;
-        if (bNSCLientCompatible) {
-          msg += strEx::itos(counter.getValue());
-        } else {
-          std::string tStr;
-          if (crit.max.hasBounds() && crit.max.checkMAX(counter.getValue())) {
-            tStr = crit.max.prettyPrint(name, counter.getValue()) + " > critical";
-            NSCHelper::escalteReturnCodeToCRIT(returnCode);
-          } else if (crit.min.hasBounds() && crit.min.checkMIN(counter.getValue())) {
-            tStr = crit.min.prettyPrint(name, counter.getValue()) + " < critical";
-            NSCHelper::escalteReturnCodeToCRIT(returnCode);
-          } else if (warn.max.hasBounds() && warn.max.checkMAX(counter.getValue())) {
-            tStr = warn.max.prettyPrint(name, counter.getValue()) + " > warning";
-            NSCHelper::escalteReturnCodeToWARN(returnCode);
-          } else if (warn.min.hasBounds() && warn.min.checkMIN(counter.getValue())) {
-            tStr = warn.min.prettyPrint(name, counter.getValue()) + " < warning";
-            NSCHelper::escalteReturnCodeToWARN(returnCode);
-          } else if (bShowAll) {
-            tStr = name + ": " + strEx::itos(counter.getValue());
-          }
-          perf += checkHolders::SizeMaxMin<__int64, checkHolders::int64_handler<> >::printPerf(name, counter.getValue(), warn, crit);
-          msg += tStr;
+      PDH::PDHQuery pdh;
+      PDHCollectors::StaticPDHCounterListener counter;
+      std::string name = (*it).first;
+      if (name.empty())
+        name = (*it).second;
+      pdh.addCounter((*it).second, &counter);
+      pdh.open();
+      pdh.collect();
+      if (bNSCLientCompatible) {
+        msg += strEx::itos(counter.getValue());
+      } else {
+        std::string tStr;
+        if (crit.max.hasBounds() && crit.max.checkMAX(counter.getValue())) {
+          tStr = crit.max.prettyPrint(name, counter.getValue()) + " > critical";
+          NSCHelper::escalteReturnCodeToCRIT(returnCode);
+        } else if (crit.min.hasBounds() && crit.min.checkMIN(counter.getValue())) {
+          tStr = crit.min.prettyPrint(name, counter.getValue()) + " < critical";
+          NSCHelper::escalteReturnCodeToCRIT(returnCode);
+        } else if (warn.max.hasBounds() && warn.max.checkMAX(counter.getValue())) {
+          tStr = warn.max.prettyPrint(name, counter.getValue()) + " > warning";
+          NSCHelper::escalteReturnCodeToWARN(returnCode);
+        } else if (warn.min.hasBounds() && warn.min.checkMIN(counter.getValue())) {
+          tStr = warn.min.prettyPrint(name, counter.getValue()) + " < warning";
+          NSCHelper::escalteReturnCodeToWARN(returnCode);
+        } else if (bShowAll) {
+          tStr = name + ": " + strEx::itos(counter.getValue());
         }
-
-        pdh.close();
-      } catch (const PDH::PDHException &e) {
-        NSC_LOG_ERROR_STD("ERROR: " + e.str_);
-        msg = static_cast<std::string>("ERROR: ") + e.str_;
-        return 0;
+        perf += checkHolders::SizeMaxMin<__int64, checkHolders::int64_handler<> >::printPerf(name, counter.getValue(), warn, crit);
+        msg += tStr;
       }
-    } catch (PDH::PDHException e) {
-      NSC_LOG_ERROR_STD("ERROR: " + e.str_);
+      pdh.close();
+    } catch (const PDH::PDHException &e) {
+      NSC_LOG_ERROR_STD("ERROR: " + e.str_ + " (" + name + ")");
       msg = static_cast<std::string>("ERROR: ") + e.str_;
-      return NSCAPI::returnCRIT;
+      return 0;
     }
   }

trunk/modules/CheckSystem/PDHCollector.cpp

@@ -82 +82 @@
   }while (!(WaitForSingleObject(hStopEvent_, checkIntervall_*100) == WAIT_OBJECT_0));
 
-  if (!CloseHandle(hStopEvent_))
-    NSC_LOG_ERROR_STD("Failed to close stopEvent handle: " + strEx::itos(GetLastError()));
-  else
-    hStopEvent_ = NULL;
-  try {
-    pdh.close();
-  } catch (const PDH::PDHException &e) {
-    NSC_LOG_ERROR_STD("Failed to close performance counters: " + e.str_);
+  {
+    MutexLock mutex(mutexHandler);
+    if (!mutex.hasMutex()) {
+      NSC_LOG_ERROR("Failed to get Mute when closing thread!");
+    }
+
+    if (!CloseHandle(hStopEvent_))
+      NSC_LOG_ERROR_STD("Failed to close stopEvent handle: " + strEx::itos(GetLastError()));
+    else
+      hStopEvent_ = NULL;
+    try {
+      pdh.close();
+    } catch (const PDH::PDHException &e) {
+      NSC_LOG_ERROR_STD("Failed to close performance counters: " + e.str_);
+    }
   }
   return 0;
@@ -99 +106 @@
  */
 void PDHCollector::exitThread(void) {
+  MutexLock mutex(mutexHandler);
+  if (!mutex.hasMutex()) {
+    NSC_LOG_ERROR("Failed to get Mute when trying to close thread!");
+    return;
+  }
   if (hStopEvent_ == NULL)
-    NSC_LOG_ERROR("Failed to get Mutex!");
+    NSC_LOG_ERROR("Failed to get stop event!");
   else
     if (!SetEvent(hStopEvent_)) {

trunk/modules/CheckSystem/PDHCollector.h

@@ -49 +49 @@
 
 private:
-  bool isRunning(void);
-  void startRunning(void);
-  void stopRunning(void);
+//  bool isRunning(void);
+//  void startRunning(void);
+//  void stopRunning(void);
 
 };