Changeset 269 in Sophya

Timestamp:

Apr 27, 1999, 5:01:44 PM (26 years ago)

Author:

ansari

Message:

Persist<NDataBlock> Reza 27/04/99

Location:

trunk/SophyaLib/BaseTools

Files:

• defs.h (deleted)
• machdefs.h (modified) (1 diff)
• ndatablock.cc (modified) (6 diffs)
• ndatablock.h (modified) (3 diffs)
• objfio.h (added)
• peidainit.cc (modified) (2 diffs)
• pexceptions.cc (modified) (2 diffs)
• ppersist.cc (modified) (4 diffs)
• ppersist.h (modified) (3 diffs)

trunk/SophyaLib/BaseTools/machdefs.h

@@ -230 +230 @@
 
 #ifdef __GNUG__
-#define GNU_TEMPLATES
+#define ANSI_TEMPLATES
+// #define GNU_TEMPLATES
 #define HAS_STR_NPOS
 #define HAS_EXPLICIT

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -9 +9 @@
 #include "pexceptions.h"
 #include "ndatablock.h"
+#include "objfio.h"
 
 using namespace PlanckDPC;
@@ -245 +246 @@
 // Re-dimension, dans ce cas re-allocation de la place
 {
+// Pas de realloc, si pas de changement de taille ?
+if (n == mSz)  return;  // $CHECK$ A verifier , Reza 26/04/99
 Alloc(n);
 }
@@ -275 +278 @@
 if(i1>=mSz || n<=0 || !p) return;
 size_t i2 = i1+n; if(i2>mSz) i2=mSz;
-size_t im = 1; bool enl;
+size_t im = 1; bool enl=false;
 while(i1<i2) {
   enl = false;
@@ -561 +564 @@
 }
 return result;
+}
+
+
+// -------------------------------------------------------------------------
+//   Les objets delegues pour la gestion de persistance 
+// -------------------------------------------------------------------------
+
+/*
+template <class T>
+void ObjFileIO< NDataBlock<T> >::ReadSelf(PInPersist& is)
+template <class T>
+void ObjFileIO< NDataBlock<T> >::WriteSelf(POutPersist& os)
+*/
+
+template <class T>
+FIO_NDataBlock<T>::FIO_NDataBlock()
+{
+dobj=new NDataBlock<T>;
+}
+
+template <class T>
+FIO_NDataBlock<T>::FIO_NDataBlock(string const & filename) 
+{
+dobj=new NDataBlock<T>; 
+Read(filename);
+}
+
+template <class T>
+FIO_NDataBlock<T>::FIO_NDataBlock(const NDataBlock<T> & obj) 
+{ 
+dobj = new NDataBlock<T>(obj); 
+}
+
+template <class T>
+FIO_NDataBlock<T>::FIO_NDataBlock(const NDataBlock<T> * obj) 
+{ 
+dobj = new NDataBlock<T>(*obj); 
+}
+
+template <class T>
+FIO_NDataBlock<T>::~FIO_NDataBlock()
+{
+if (dobj) delete dobj;
+}
+
+template <class T>
+AnyDataObj* FIO_NDataBlock<T>::DataObj()
+{
+return(dobj);
+}
+
+
+template <class T>
+void FIO_NDataBlock<T>::ReadSelf(PInPersist& is)
+{
+// On lit les 3 premiers uint_8
+uint_8 itab[3];
+is.Get(itab, 3);
+if (dobj == NULL) dobj = new NDataBlock<T>(itab[1]);
+else dobj->ReSize(itab[1]);
+// On lit le tableau de nombres
+PIOSReadArray(is, dobj->Data(), dobj->Size()); 
+}
+
+
+template <class T>
+void FIO_NDataBlock<T>::WriteSelf(POutPersist& os) const
+{
+if (dobj == NULL)   return;  // Attention - $CHECK$ Reza 26/04/99
+//  On ecrit 3 uint_4 
+//  0 : Numero de version,  1 : Taille,  2  reserve a l
+uint_8 itab[3];
+itab[0] = 1;
+itab[1] = dobj->Size();
+itab[2] = 0;
+os.Put(itab, 3);
+//  On ecrit le tableau de nombres 
+PIOSWriteArray(os, dobj->Data(), dobj->Size()); 
 }
 
@@ -577 +658 @@
 #pragma define_template NDataBlock< complex<float> >
 #pragma define_template NDataBlock< complex<double> >
-#endif
-
-#ifdef __GNU_TEMPLATES__
+
+// Instances des delegues FileIO (PPersist)
+#pragma define_template FIO_NDataBlock<uint_1>;
+#pragma define_template FIO_NDataBlock<uint_2>;
+#pragma define_template FIO_NDataBlock<int_2>;
+#pragma define_template FIO_NDataBlock<int_4>;
+#pragma define_template FIO_NDataBlock<int_8>;
+#pragma define_template FIO_NDataBlock<uint_2>;
+#pragma define_template FIO_NDataBlock<uint_4>;
+#pragma define_template FIO_NDataBlock<uint_8>;
+#pragma define_template FIO_NDataBlock<r_8>;
+#pragma define_template FIO_NDataBlock<r_4>;
+#pragma define_template FIO_NDataBlock< complex<float> >;
+#pragma define_template FIO_NDataBlock< complex<double> >;
+
+#endif
+
+
+#if defined(ANSI_TEMPLATES) || defined(GNU_TEMPLATES)
 template class NDataBlock<uint_1>;
 template class NDataBlock<uint_2>;
@@ -592 +689 @@
 template class NDataBlock< complex<float> >;
 template class NDataBlock< complex<double> >;
-#endif
-
-#if defined(__ANSI_TEMPLATES__) 
-template class NDataBlock<uint_1>;
-template class NDataBlock<uint_2>;
-template class NDataBlock<int_2>;
-template class NDataBlock<int_4>;
-template class NDataBlock<int_8>;
-template class NDataBlock<uint_2>;
-template class NDataBlock<uint_4>;
-template class NDataBlock<uint_8>;
-template class NDataBlock<r_4>;
-template class NDataBlock<r_8>;
-template class NDataBlock< complex<float> >;
-template class NDataBlock< complex<double> >;
-#endif
+
+// Instances des delegues FileIO (PPersist)
+template class FIO_NDataBlock<uint_1>;
+template class FIO_NDataBlock<uint_2>;
+template class FIO_NDataBlock<int_2>;
+template class FIO_NDataBlock<int_4>;
+template class FIO_NDataBlock<int_8>;
+template class FIO_NDataBlock<uint_2>;
+template class FIO_NDataBlock<uint_4>;
+template class FIO_NDataBlock<uint_8>;
+template class FIO_NDataBlock<r_8>;
+template class FIO_NDataBlock<r_4>;
+template class FIO_NDataBlock< complex<float> >;
+template class FIO_NDataBlock< complex<double> >;
+#endif

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -8 +8 @@
 #include "machdefs.h"
 #include "anydataobj.h"
+#include "ppersist.h"
 #include <iostream.h>
 
@@ -110 +111 @@
 template<class T>
 inline ostream& operator << (ostream& os, const NDataBlock<T>& a)
-                      {Print(os); return(os);}
+                      {a.Print(os); return(os);}
 template<class T>
 inline NDataBlock<T> operator + (const NDataBlock<T>& a,T b)
@@ -149 +150 @@
                       {return a.Div(b);}
 
+
+// Classe pour la gestion de persistance
+template <class T>
+class FIO_NDataBlock : public  PPersist  {
+
+public:
+            FIO_NDataBlock();
+            FIO_NDataBlock(string const & filename); 
+            FIO_NDataBlock(const NDataBlock<T> & obj);
+            FIO_NDataBlock(const NDataBlock<T> * obj);
+  virtual   ~FIO_NDataBlock();
+
+  virtual   AnyDataObj* DataObj();
+  inline operator NDataBlock<T>() { return(*dobj); }
+
+protected :
+  virtual void       ReadSelf(PInPersist&);           
+  virtual void       WriteSelf(POutPersist&) const;  
+  NDataBlock<T> * dobj;
+
+};
+
 } // Fin du namespace
 

trunk/SophyaLib/BaseTools/peidainit.cc

@@ -3 +3 @@
 #include <stdio.h>
 #include "pexceptions.h"
+#include "ppersist.h"
 #include "peidainit.h"
 // ---  Classe d'initialisation de PEIDA++, (PPersistMgr en particulier)
@@ -22 +23 @@
   #endif
 
+  PIOPersist::Initialize();
 //DEL  PPersistMgr::classList = new PPersistMgr::ClassList;
 //DEL  PShPersist::objList    = new PShPersist::ObjList;

trunk/SophyaLib/BaseTools/pexceptions.cc

@@ -5 +5 @@
 
 void PFailHandler(void); 
+
+// egcs ne semble pas connaitre set_new_handler (Reza 26/04/99)
+#ifdef __GNUG__
+void PFailHandler(void) {}
+void InitFailNewHandler() {}
+#else
 
 void PFailHandler(void)
@@ -18 +24 @@
 }
 
+#endif

trunk/SophyaLib/BaseTools/ppersist.cc

@@ -37 +37 @@
 
 MD5_CTX PIOPersist::ctx;
-PIOPersist::ClassList PIOPersist::classList;
-
+PIOPersist::ClassList * PIOPersist::classList = NULL;   // $CHECK$ Reza 26/04/99
+
+//++
+void
+PIOPersist::Initialize()
+//  Initialisation globale (objets statiques) $CHECK$ Reza 26/04/99
+//--
+{
+classList = new PIOPersist::ClassList;
+}
 
 //++
@@ -51 +59 @@
 //--
 {
-  if (classList.size() && (classList.find(classId) != classList.end())) {
+  if (classList->size() && (classList->find(classId) != classList->end())) {
       cerr << "RegisterClass : Error, " << hex << classId << dec 
            << " already registered." << endl;
@@ -57 +65 @@
     }
   
-  classList[classId] = f;
+  (*classList)[classId] = f;
 }
 
@@ -64 +72 @@
 PIOPersist::FindCreatorFunc(uint_8 classId)
 {
-  ClassList::iterator i = classList.find(classId);
-  if (i == classList.end()) throw(NotFoundExc("PIOPersist::FindCreatorFunc"));
+  ClassList::iterator i = classList->find(classId);
+  if (i == classList->end()) throw(NotFoundExc("PIOPersist::FindCreatorFunc"));
   return (*i).second;
 }

trunk/SophyaLib/BaseTools/ppersist.h

@@ -25 +25 @@
 #endif
 
+// Classe de base pour les objets qui peuvent devenir PPersist
+
 namespace PlanckDPC {
   
+  class AnyDataObj;
+
   class PIOPersist;
   class PInPersist;
@@ -48 +52 @@
     void               Write(POutPersist&, string const& tag) const; 
     void               ReadAtTag(PInPersist& s, string const& tag);
+
+    virtual AnyDataObj* DataObj()       // Retourne l'objet reel $CHECK$ - Reza 
+                  { return(NULL); }     // Devrait etre virtuelle pure
   protected:  
     virtual void       ReadSelf(PInPersist&)=0;           
@@ -76 +83 @@
     static MD5_CTX ctx;
   
+    static void Initialize();   // Pour initialiser classList
   private:
 
     typedef map<uint_8, ClassCreatorFunc, less<uint_8> > ClassList;  
-    static ClassList             classList;
+    // Pas de createur appele pour objets statiques sur Linux - $CHECK$ Reza 26/04/99
+    static ClassList *           classList;  
 
   protected: