Changeset 5713 for trunk

Timestamp:

01/05/05 19:40:26 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MGList.cc (modified) (3 diffs)
• mbase/MGList.h (modified) (2 diffs)
• mbase/MLog.cc (modified) (2 diffs)
• mbase/MParContainer.cc (modified) (3 diffs)
• mbase/MParContainer.h (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (18 diffs)
• mbase/MStatusDisplay.h (modified) (1 diff)
• mbase/MString.cc (modified) (2 diffs)
• mbase/MString.h (modified) (1 diff)
• mbase/MTask.cc (modified) (3 diffs)
• mbase/MTask.h (modified) (1 diff)
• mfileio/MWriteRootFile.cc (modified) (1 diff)
• mhbase/MFillH.cc (modified) (4 diffs)
• mhcalib/MHCalibrationRelTimeCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
  2005/01/05 Thomas Bretz
 
-   * mbase/MStatusDisplay.cc:
-     - fixed some lines in pulldown-menus
-     - add TPads to ListOfCleanups in ClonePad (workaround!)
-
    * mcalib/MCalibrationBlindPix.cc, mcalib/MCalibrationChargeCalc.cc,
      mhcalib/MHCalibrationRelTimeCam.cc:
@@ -41 +37 @@
      - made sure that LoGain is flagged non-valid if no lo-gain exists
      - push time back at the edge of the allowed limits if outside
+
+   * mbase/MGList.[h,cc]:
+     - introduced new functions Delete and DeletePictures
+     - SetBit(kMustCleanup) in constructor. Otherwise it is not
+       correctly removed from ListOfCleanups
+
+   * mbase/MLog.cc:
+     - SetBit(kMustCleanup) if adding a plugin to make sure it is cleaned
+       from the list
+
+   * mbase/MParContainer.[h,cc]:
+     - replaced return type of GetDescriptor by TString. The old version
+       was terribly wrong! The returned memory wasn't removed as soon
+       as the function returned.
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - for security (thread safty) replaced all Form() by MString::Form()
+     - implemented a more secure scheme of Closing (Clone()) this was
+       a hint given by valgrind
+     - set kMustCleanup for all new object in ClonePad not only kCanDelete
+     - fixed some lines in pulldown-menus
+     - add TPads to ListOfCleanups in ClonePad (workaround!)
+
+   * mbase/MString.[h,cc]:
+     - implemented a new static Form() function returning a copy of
+       the result
+
+   * mbase/MTask.[h,cc]:
+     - replaced return type of GetDescriptor by TString. The old version
+       was terribly wrong! The returned memory wasn't removed as soon
+       as the function returned. 
+     - Made GetDescriptor thread safe using MString::Form
+
+   * mfileio/MWriteRootFile.cc:
+     - Use GetDescriptor().Data() when using any kind of printf function
+
+   * mhbase/MFillH.cc:
+     - replaced string concatenation in all constructors by a Form 
+       (also suggested by valgrind)
+
+   * mhcalib/MHCalibrationRelTimeCam.cc:
+     - made some output fit into 80col boundary
 
 

trunk/MagicSoft/Mars/mbase/MGList.cc

@@ -54 +54 @@
 MGList::MGList() : TList()
 {
+    // Make sure that all object deleted are also deleted from this list
     gROOT->GetListOfCleanups()->Add(this);
+    // Make sure that this doesn't remain in ListOfCleanups after deletion
+    SetBit(kMustCleanup);
 }
 
@@ -63 +66 @@
 //
 MGList::~MGList()
+{
+    DeletePictures();
+}
+
+// --------------------------------------------------------------------------
+//
+//  Free/Delete all TGPicture store in list.
+//
+void MGList::DeletePictures()
 {
     TObject *obj;
@@ -82 +94 @@
 // --------------------------------------------------------------------------
 //
+//  Delete all pictures. Call TList::Delete.
+//
+void MGList::Delete(Option_t *option)
+{
+    DeletePictures();
+    TList::Delete(option);
+}
+
+// --------------------------------------------------------------------------
+//
 //  Does a dynamic cast from a TObject to a TGWidget. This is necesary
 //  if a class derived from TObject inherits also from TGWidget and

trunk/MagicSoft/Mars/mbase/MGList.h

@@ -16 +16 @@
 
     void      AddPicture(TGPicture *pic, const char *name);
+    void      DeletePictures();
 
 public:
@@ -23 +24 @@
     void Add(TObject *obj);
     void Add(TObject *obj, Option_t *opt);
+
+    void Delete(Option_t *option="");
 
     const TGPicture *GetPicture(const char *name);

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -117 +117 @@
 
 #undef DEBUG
-//#define DEBUG
+#define DEBUG
 
 
@@ -701 +701 @@
 // is automatically removed from the list of active plugins.
 //
-// If MLog should take the ownership cal plug->SetBit(kCanDelete);
+// If MLog should take the ownership call plug->SetBit(kCanDelete);
 //
 void MLog::AddPlugin(MLogPlugin *plug)
 {
     fPlugins->Add(plug);
-}
+
+    // Make sure that it is recursively deleted from all objects in ListOfCleanups
+    plug->SetBit(kMustCleanup);
+}

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -208 +208 @@
 // class name it returns the object name and in []-brackets the class name.
 //
-const char *MParContainer::GetDescriptor() const
+const TString MParContainer::GetDescriptor() const
 {
     return GetDescriptor(*this);
@@ -218 +218 @@
 // class name it returns the object name and in []-brackets the class name.
 //
-const char *MParContainer::GetDescriptor(const TObject &o)
+const TString MParContainer::GetDescriptor(const TObject &o)
 {
     //
@@ -227 +227 @@
     MString desc;
     desc.Print("%s [%s]", o.GetName(), o.ClassName());
-    return (TString)o.GetName()==o.ClassName() ? o.ClassName() : desc.Data();
+    return (TString)o.GetName()==o.ClassName() ? o.ClassName() : desc;
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -74 +74 @@
     virtual void        FillBuffer(char *&buffer);
 
-    static const char *GetDescriptor(const TObject &o);
+    static const TString GetDescriptor(const TObject &o);
 
-    virtual const char   *GetDescriptor() const;
+    virtual const TString GetDescriptor() const;
     virtual const TString GetUniqueName() const;
     virtual const char   *GetName() const       { return fName.Data(); }

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -91 +91 @@
 #include <TGProgressBar.h>        // TGHProgressBar
 #include <TRootEmbeddedCanvas.h>  // TRootEmbeddedCanvas
+
+#include "MString.h"
 
 #include "MLog.h"                 // MLog
@@ -336 +338 @@
 
     // Add MARS version
-    TGLabel *l = new TGLabel(f, Form("Official Release: V%s", MARSVER));
+    TGLabel *l = new TGLabel(f, MString::Form("Official Release: V%s", MARSVER));
     fList->Add(l);
 
@@ -347 +349 @@
 
     // Add root version
-    l = new TGLabel(f, Form("Using ROOT v%s", ROOTVER));
+    l = new TGLabel(f, MString::Form("Using ROOT v%s", ROOTVER));
     fList->Add(l);
 
@@ -575 +577 @@
 void MStatusDisplay::SetStatusLine2(const MParContainer &cont)
 {
-    SetStatusLine2(Form("%s: %s", cont.GetDescriptor(), cont.GetTitle()));
+    SetStatusLine2(MString::Form("%s: %s", cont.GetDescriptor().Data(), cont.GetTitle()));
 }
 
@@ -601 +603 @@
     // from the list in the destructor.
     //
-    gROOT->GetListOfSpecials()->Add(this);
+//    gROOT->GetListOfSpecials()->Add(this);
 
     fFont = gVirtualX->LoadQueryFont("7x13bold");
@@ -694 +696 @@
 
     //
-    // Delete the list list of canvases used in batch mode
+    // Delete the list of canvases used in batch mode
     // instead of the Root Embedded Canvases in the TGTab
     //
@@ -971 +973 @@
     {
         // Tell the X-Requester how to call this method
-        TString str = Form("%d", (ULong_t)f);
+        TString str = MString::Form("%d", (ULong_t)f);
 
         TMethodCall call(IsA(), "UpdateTab", "NULL");
@@ -1063 +1065 @@
     gSystem->Unlink(name);
 
-    SetStatusLine2(Form("Done (%dpage(s))", pages));
+    SetStatusLine2(MString::Form("Done (%dpage(s))", pages));
 
     return pages;
@@ -1177 +1179 @@
     case kFileExit:
         if (id==kFileExit || id==kFileClose)
-            CloseWindow();
+            if (Close())
+                delete this;
         fStatus = (Status_t)id;
         return kTRUE;
@@ -1489 +1492 @@
 }
 
-void MStatusDisplay::CloseWindow()
+Bool_t MStatusDisplay::Close()
 {
     // Got close message for this MainFrame. Calls parent CloseWindow()
@@ -1512 +1515 @@
 
     if (fIsLocked<=0 && IsOnHeap())
-    {
-        //gLog << dbg << "delete " << fName << ";" << endl;
-        delete this;
-        // DO NOT EXECUTE ANY COMMAND AFTER this!
-    }
-    else
-    {
-        fStatus = kFileExit;
-        //gLog << dbg << fName << ".fStatus=kFileExit;" << endl;
-    }
+        return kTRUE;
+
+    fStatus = kFileExit;
+    return kFALSE;
+}
+
+void MStatusDisplay::CloseWindow()
+{
+    Close();
 }
 
@@ -1621 +1623 @@
 
         // Clone also important bits (FIXME: Is this correct)
-        clone->SetBit(obj->TestBits(kMustCleanup|kCannotPick|kNoContextMenu));
+        clone->SetBit(obj->TestBits(kCannotPick|kNoContextMenu));
 
         // Now make sure that the clones are deleted at a later time
-        clone->SetBit(kCanDelete);
+        clone->SetBit(kCanDelete|kMustCleanup);
 
         // FIXME: This is a workaround for the problem with the MAstroCatalog in
@@ -2015 +2017 @@
         }
 
-        SetStatusLine2(Form("Tab #%d", i));
+        SetStatusLine2(MString::Form("Tab #%d", i));
 
         //
@@ -2078 +2080 @@
         ps.TextNDC(0.5, 1.015, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString());
         ps.SetTextAlign(31); // right top
-        ps.TextNDC(1, 1.015, Form("Page No.%i (%i)  ", page++, i));
+        ps.TextNDC(1, 1.015, MString::Form("Page No.%i (%i)  ", page++, i));
         line.PaintLineNDC(0, 1.01, 1, 1.01);
 
@@ -2118 +2120 @@
         *fLog << inf << "done." << endl;
 
-    SetStatusLine2(Form("Done (%dpages)", page-1));
+    SetStatusLine2(MString::Form("Done (%dpages)", page-1));
 
     return page-1;
@@ -2165 +2167 @@
         }
 
-        SetStatusLine2(Form("Tab #%d", i));
+        SetStatusLine2(MString::Form("Tab #%d", i));
 
         //
@@ -2249 +2251 @@
         }
 
-        SetStatusLine2(Form("Tab #%d", i));
+        SetStatusLine2(MString::Form("Tab #%d", i));
 
         //
@@ -2460 +2462 @@
 Bool_t MStatusDisplay::HandleEvent(Event_t *event)
 {
-    Bool_t rc = TGMainFrame::HandleEvent(event);
+    // Instead  of doing this in CloseWindow (called from HandleEvent)
+    // we do it here. This makes sure, that handle event doesn't
+    // execute code after deleting this.
+    if (event->fType==kDestroyNotify)
+    {
+        if (Close())
+        delete this;
+//        Close();
+        return kTRUE;
+    }
+
+    const Bool_t rc = TGMainFrame::HandleEvent(event);
 
     //

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -110 +110 @@
     Bool_t ProcessMessageTextview(Long_t submsg, Long_t mp1, Long_t mp2);
     Bool_t ProcessMessageUser(Long_t submsg, Long_t mp1, Long_t mp2);
+    Bool_t Close();
     void   CloseWindow();
     Bool_t HandleConfigureNotify(Event_t *);

trunk/MagicSoft/Mars/mbase/MString.cc

@@ -59 +59 @@
 //  string.Print("  MyString has %d bytes  ", 128).Strip(TString::kBoth);
 //
-MString &MString::Print(const char *fmt, ...)
+MString &MString::Print(const char *fmt, va_list &ap)
 {
-    va_list ap;
-    va_start(ap, fmt);
-
     Int_t n=256;
 
@@ -87 +84 @@
     return *this;
 }
+
+// --------------------------------------------------------------------------
+//
+// Thread safe replacement for Form, use it like:
+//
+//  MString string;
+//  string.Print("MyString has %d bytes", 128);
+//
+// As a special feature the function returns the reference to the MString
+// so that you can directly work with it, eg.
+//
+//  string.Print("  MyString has %d bytes  ", 128).Strip(TString::kBoth);
+//
+MString &MString::Print(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+
+    return Print(fmt, ap);
+}
+
+// --------------------------------------------------------------------------
+//
+// Thread safe replacement for Form, use it like:
+//
+//  MString string;
+//  string.Print("MyString has %d bytes", 128);
+//
+// As a special feature the function returns the reference to the MString
+// so that you can directly work with it, eg.
+//
+//  string.Print("  MyString has %d bytes  ", 128).Strip(TString::kBoth);
+//
+// The static version of this function returns a copy(!) of the resulting
+// M/TString.
+//
+MString MString::Form(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+
+    MString ret;
+    ret.Print(fmt, ap);
+    return ret;
+}

trunk/MagicSoft/Mars/mbase/MString.h

@@ -12 +12 @@
 {
 public:
+    MString &Print(const char *fmt, va_list &ap);
     MString &Print(const char *fmt, ...);
+    static MString Form(const char *fmt, ...);
 
     ClassDef(MString, 1) // Tool to make Form() thread safe against other TStrings

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -101 +101 @@
 #include <TStopwatch.h> // TStopwatch
 
+#include "MString.h"
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -335 +337 @@
 // name (eg. ;1)
 //
-const char *MTask::GetDescriptor() const
+const TString MTask::GetDescriptor() const
 {
     //
@@ -343 +345 @@
     //
     if (fName==ClassName())
-        return fSerialNumber==0 ? ClassName() : Form("%s;%d", ClassName(), fSerialNumber);
+        return fSerialNumber==0 ? ClassName() : MString::Form("%s;%d", ClassName(), fSerialNumber);
 
     return fSerialNumber>0 ?
-        Form("%s;%d [%s]", fName.Data(), fSerialNumber, ClassName()) :
-        Form("%s [%s]", fName.Data(), ClassName());
+        MString::Form("%s;%d [%s]", fName.Data(), fSerialNumber, ClassName()) :
+        MString::Form("%s [%s]", fName.Data(), ClassName());
 }
 

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -89 +89 @@
     Byte_t GetSerialNumber() const           { return fSerialNumber; }
 
-    const char *GetDescriptor() const;
+    const TString GetDescriptor() const;
 
     // Task execution statistics

trunk/MagicSoft/Mars/mfileio/MWriteRootFile.cc

@@ -405 +405 @@
         const char *cname = cont->GetName();
         const char *tname = entry->GetName();
-        const TString ttitle(Form("Tree containing %s", cont->GetDescriptor()));
+        const TString ttitle(Form("Tree containing %s", cont->GetDescriptor().Data()));
 
         //

trunk/MagicSoft/Mars/mhbase/MFillH.cc

@@ -166 +166 @@
         return;
 
-    fTitle = "Fill " + fHName;
+    fTitle = Form("Fill %s", fHName.Data());
     if (fParContainerName.IsNull())
         return;
 
-    fTitle += " from " + fParContainerName;
+    fTitle += Form(" from %s", fParContainerName.Data());
 }
 
@@ -209 +209 @@
 
     if (!title)
-        fTitle = "Fill " + fHName + " from " + par->GetDescriptor();
+        fTitle = Form("Fill %s from %s", fName.Data(), par->GetDescriptor().Data());
 }
 
@@ -236 +236 @@
         return;
 
-    fTitle = (TString)"Fill " + hist->GetDescriptor();
+    fTitle = Form("Fill %s", hist->GetDescriptor().Data());
     if (!par)
         return;
 
-    fTitle += " from " + fParContainerName;
+    fTitle += Form(" from %s", fParContainerName.Data());
 }
 
@@ -265 +265 @@
 
     if (!title)
-        fTitle = (TString)"Fill " + hist->GetDescriptor() + " from " + par->GetDescriptor();
+        fTitle = Form("Fill %s from %s", hist->GetDescriptor().Data(), par->GetDescriptor().Data());
 }
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -679 +679 @@
   if (overflow > 0.0005*hist->GetEntries())
     {
-      *fLog << warn << "HiGain Hist-overflow occurred " << overflow
+      *fLog << warn << "HiGain Hist-overflow " << overflow
             << " times in " << pix.GetName() << " (w/o saturation!) " << endl;
     }
@@ -686 +686 @@
   if (overflow > 0.0005*hist->GetEntries())
     {
-      *fLog << warn << "HiGain Hist-underflow occurred " << overflow
+      *fLog << warn << "HiGain Hist-underflow " << overflow
             << " times in " << pix.GetName() << " (w/o saturation!) " << endl;
     }