Changeset 2657 in Sophya

Timestamp:

Apr 5, 2005, 5:37:54 PM (20 years ago)

Author:

ansari

Message:

1/ Correction petite erreur ds NDataBlock et recuperation de
MemoryObjectId a travers une fonction globale (static) ds AnyDataObj
2/ Ajout fonctions pour lister les classes PPersist handler ds ppersist.h .cc

Reza, 5 Avril 2005

Location:

trunk/SophyaLib/BaseTools

Files:

• anydataobj.h (modified) (1 diff)
• ndatablock.cc (modified) (3 diffs)
• ndatablock.h (modified) (1 diff)
• ppersist.cc (modified) (2 diffs)
• ppersist.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/anydataobj.h

@@ -16 +16 @@
   AnyDataObj() { } 
   virtual ~AnyDataObj() { }
+
+//! Return a process wide unique identifier 
+  static uint_8 getUniqueId();
 };
 

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -10 +10 @@
 #include "pexceptions.h"
 #include "ndatablock.h"
+
+/* ---- Pour renvoyer un identificateur unique ---- */
+static uint_8 _ndrefid_ = 0; // Identificateur de NDREF cree 
+uint_8 AnyDataObj::getUniqueId()
+{
+  _ndrefid_++;
+  return ( _ndrefid_ );
+}
 
 /*!
@@ -310 +318 @@
  */
 
-static uint_8 _ndrefid_ = 0; // Identificateur de NDREF cree 
 
 template <class T>
@@ -327 +334 @@
 mSRef = new NDREF;
 mSRef->nref = 1;
-mSRef->dsid = ++_ndrefid_;
+mSRef->dsid = AnyDataObj::getUniqueId(); 
 if(data) mSRef->data = data;
 else {mSRef->data = new T[n]; if (zero) memset(mSRef->data,0,n*sizeof(T));}

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -110 +110 @@
   inline T const*  End() const    {return mSRef->data+mSz;}
   //! Return the number of references to the data structure
-  inline size_t NRef() const {if(mSRef) return 0; else return mSRef->nref;}
+  inline size_t NRef() const {if(mSRef) return mSRef->nref;  else return 0; }
 
   // Impression

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -8 +8 @@
 #include "anydataobj.h"
 #include <iostream>
+#include <iomanip>
 #include <typeinfo>
 
@@ -105 +106 @@
 //      class_typename should be typeid(DataObject).name(), to be 
 //      used by POutPersist::PutDataObject() methods.
+
+//! Lists the registered PPersist handler classes and the corresponding class id.
+void
+PIOPersist::ListPPHandlers()
+{
+  cout << " PIOPersist::ListPPHandlers() - List of registered PPersist handler classes " << endl;
+  map<string, uint_8>::iterator it;
+  int k = 0;
+  for (it = (*ppclassNameList).begin(); it != (*ppclassNameList).end(); it++) {
+    cout << ++k << ":   " << (*it).first << "\n" << "          ClassId: Hex=  " 
+         << hex << (*it).second << "  (Dec= " << dec << (*it).second << ")" << endl;   
+  }
+}
+
+//! Lists the registered DataObj classes with the corresponding PPHandler name
+void
+PIOPersist::ListDataObjClasses()
+{
+  cout << " PIOPersist::ListDataObjClasses() : Registered DataObj class list " << endl;
+  map<string, uint_8>::iterator it;
+  int k = 0;
+  for (it = (*dobjclassNameList).begin(); it != (*dobjclassNameList).end(); it++) {
+    cout << ++k << "- "  << (*it).first << "  ->  " << getPPClassName((*it).second) << endl; 
+  }
+}
 
 PIOPersist::ClassCreatorFunc

trunk/SophyaLib/BaseTools/ppersist.h

@@ -77 +77 @@
     static void                  RegisterPPHandlerClass(uint_8 classId, string ppclass_name, ClassCreatorFunc f);
     static void                  RegisterDataObjClass(uint_8 classId, string class_name);
+
+    static void                  ListPPHandlers();
+    static void                  ListDataObjClasses();
 
     static ClassCreatorFunc      FindCreatorFunc(uint_8 classId);