Removing unapropriate class and method names.
authorcvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 4 Sep 2009 22:43:44 +0000 (22:43 +0000)
committercvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 4 Sep 2009 22:43:44 +0000 (22:43 +0000)
MONITOR/AliChildProcTerminator.cxx [moved from MONITOR/AliChildReaper.cxx with 61% similarity]
MONITOR/AliChildProcTerminator.h [moved from MONITOR/AliChildReaper.h with 52% similarity]
MONITOR/AliOnlineReco.cxx
MONITOR/AliOnlineReco.h
MONITOR/MONITORLinkDef.h
MONITOR/libMONITOR.pkg

similarity index 61%
rename from MONITOR/AliChildReaper.cxx
rename to MONITOR/AliChildProcTerminator.cxx
index 8eb3f65..1b58a4d 100644 (file)
@@ -7,26 +7,26 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-#include "AliChildReaper.h"
+#include "AliChildProcTerminator.h"
 
 #include <sys/wait.h>
 
 //______________________________________________________________________________
-// Full description of AliChildReaper
+// Full description of AliChildProcTerminator
 //
 
-ClassImp(AliChildReaper)
+ClassImp(AliChildProcTerminator)
 
-AliChildReaper* AliChildReaper::fgTheOne = 0;
+AliChildProcTerminator* AliChildProcTerminator::fgTheOne = 0;
 
-AliChildReaper* AliChildReaper::Instance()
+AliChildProcTerminator* AliChildProcTerminator::Instance()
 {
   if (fgTheOne == 0)
-    fgTheOne = new AliChildReaper;
+    fgTheOne = new AliChildProcTerminator;
   return fgTheOne;
 }
 
-AliChildReaper::AliChildReaper()
+AliChildProcTerminator::AliChildProcTerminator()
 {
   struct sigaction sac;
   sac.sa_handler = sig_handler;
@@ -35,18 +35,18 @@ AliChildReaper::AliChildReaper()
   sigaction(SIGCHLD, &sac, 0);
 }
 
-void AliChildReaper::sig_handler(int /*sig*/)
+void AliChildProcTerminator::sig_handler(int /*sig*/)
 {
   int   status;
   pid_t pid = wait(&status);
-  Instance()->ChildDeath(pid, status);
+  Instance()->ChildProcTerm(pid, status);
 }
 
-void AliChildReaper::ChildDeath(Int_t pid, Int_t status)
+void AliChildProcTerminator::ChildProcTerm(Int_t pid, Int_t status)
 {
    Long_t args[2];
    args[0] = (Long_t) pid;
    args[1] = (Long_t) status;
 
-   Emit("ChildDeath(Int_t,Int_t)", args);
+   Emit("ChildProcTerm(Int_t,Int_t)", args);
 }
similarity index 52%
rename from MONITOR/AliChildReaper.h
rename to MONITOR/AliChildProcTerminator.h
index 036e6c6..0025936 100644 (file)
@@ -7,36 +7,36 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 
-#ifndef AliChildReaper_H
-#define AliChildReaper_H
+#ifndef AliChildProcTerminator_H
+#define AliChildProcTerminator_H
 
 #include "TObject.h"
 #include "TQObject.h"
 
 //______________________________________________________________________________
-// Short description of AliChildReaper
+// Short description of AliChildProcTerminator
 //
 
-class AliChildReaper : public TObject,
+class AliChildProcTerminator : public TObject,
                       public TQObject
 {
 public:
-  void ChildDeath(Int_t pid, Int_t status); // *SIGNAL*
+  void ChildProcTerm(Int_t pid, Int_t status); // *SIGNAL*
 
-  static AliChildReaper* Instance();
+  static AliChildProcTerminator* Instance();
 
 private:
-  AliChildReaper();
-  virtual ~AliChildReaper() {}
+  AliChildProcTerminator();
+  virtual ~AliChildProcTerminator() {}
 
-  AliChildReaper(const AliChildReaper&);            // Not implemented
-  AliChildReaper& operator=(const AliChildReaper&); // Not implemented
+  AliChildProcTerminator(const AliChildProcTerminator&);            // Not implemented
+  AliChildProcTerminator& operator=(const AliChildProcTerminator&); // Not implemented
 
   static void sig_handler(int sig);
 
-  static AliChildReaper* fgTheOne;
+  static AliChildProcTerminator* fgTheOne;
 
-  ClassDef(AliChildReaper, 0);
+  ClassDef(AliChildProcTerminator, 0);
 };
 
 #endif
index b5f4553..c604cd6 100644 (file)
@@ -8,7 +8,7 @@
  **************************************************************************/
 
 #include "AliOnlineReco.h"
-#include "AliChildReaper.h"
+#include "AliChildProcTerminator.h"
 #include "AliDimIntNotifier.h"
 
 #include <TGListBox.h>
@@ -63,7 +63,7 @@ AliOnlineReco::AliOnlineReco() :
 
   // Signal handlers
   // ROOT's TSignalHAndler works not SIGCHLD ...
-  AliChildReaper::Instance()->Connect("ChildDeath(Int_t,Int_t)", "AliOnlineReco", this, "ChildDeath(Int_t,Int_t)");
+  AliChildProcTerminator::Instance()->Connect("ChildProcTerm(Int_t,Int_t)", "AliOnlineReco", this, "ChildProcTerm(Int_t,Int_t)");
 }
 
 AliOnlineReco::mIntInt_i AliOnlineReco::FindMapEntryByPid(Int_t pid)
@@ -130,9 +130,9 @@ void AliOnlineReco::EndOfRun(Int_t run)
 // Handlers of OS signals.
 //------------------------------------------------------------------------------
 
-void AliOnlineReco::ChildDeath(Int_t pid, Int_t status)
+void AliOnlineReco::ChildProcTerm(Int_t pid, Int_t status)
 {
-  printf("child death pid=%d, statues=%d...\n", pid, status);
+  printf("child process termination pid=%d, status=%d...\n", pid, status);
 
   mIntInt_i i = FindMapEntryByPid(pid);
   if (i != fRun2PidMap.end())
@@ -152,7 +152,7 @@ void AliOnlineReco::ChildDeath(Int_t pid, Int_t status)
   }
   else
   {
-    Warning("ChildDeath", "Process with pid=%d not registered.", pid);
+    Warning("ChildProcTerm", "Process with pid=%d not registered.", pid);
   }
 }
 
index 85e612a..550f6b9 100644 (file)
@@ -47,7 +47,7 @@ public:
   // Handlers of OS signals.
   //------------------------------------------------------------------------------
 
-  void ChildDeath(Int_t pid, Int_t status);
+  void ChildProcTerm(Int_t pid, Int_t status);
 
   //------------------------------------------------------------------------------
   // Handlers of button signals.
index 46e60d5..2a7ea6d 100644 (file)
@@ -33,7 +33,7 @@
 #pragma link C++ class  TerminateSignalHandler+;
 
 #pragma link C++ class AliDimIntNotifier+;
-#pragma link C++ class AliChildReaper+;
+#pragma link C++ class AliChildProcTerminator+;
 #pragma link C++ class AliOnlineReco+;
 #pragma link C++ class AliTestChildProc+;
 
index 0494c1c..8330bbd 100644 (file)
@@ -9,7 +9,7 @@ SRCS:=  AliMonitorPlot.cxx AliMonitorHisto.cxx AliMonitorTrend.cxx \
        AliMonitorDialog.cxx AliMonitorClient.cxx \
        AliQAHistNavigator.cxx AliQAHistViewer.cxx \
        AliOnlineRecoTrigger.cxx \
-       AliDimIntNotifier.cxx AliChildReaper.cxx AliOnlineReco.cxx AliTestChildProc.cxx
+       AliDimIntNotifier.cxx AliChildProcTerminator.cxx AliOnlineReco.cxx AliTestChildProc.cxx
 
 CINTHDRS:= $(SRCS:.cxx=.h)