Foundation Classes - Reorganize of OCCT RTTI Open-Cascade-SAS#215

Implement functionality to avoid mutex operation and keeping unload data
Making Standard_Type own specialized handle to avoid sharing and atomic operations

TODO:
Simplify the base type for type. Create extended type type.
Simple will have ONLY reference to std::type_info and parent type.
Extended will have a name and size of the object.

src_t/BOPTest/BOPTest.cxx

@@ -92,7 +92,7 @@ void BOPTest::ReportAlerts(const Handle(Message_Report)& theReport)
   for (int iGravity = 0; iGravity < 2; iGravity++)
   {
     // report shapes for the same type of alert together
-    NCollection_Map<Handle(Standard_Transient)> aPassedTypes;
+    NCollection_Map<Handle(Standard_Type)> aPassedTypes;
     const Message_ListOfAlert& aList = theReport->GetAlerts (anAlertTypes[iGravity]);
     for (Message_ListOfAlert::Iterator aIt (aList); aIt.More(); aIt.Next())
     {

src_t/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx

@@ -120,8 +120,8 @@ private:
 
   BinObjMgt_Persistent myPAtt;
   TDF_LabelList myEmptyLabels;
-  TColStd_MapOfTransient myMapUnsupported;
-  TColStd_IndexedMapOfTransient myTypesMap;
+  NCollection_Map<Handle(Standard_Type)> myMapUnsupported;
+  NCollection_IndexedMap<Handle(Standard_Type)> myTypesMap;
   BinLDrivers_VectorOfDocumentSection mySections;
   TCollection_ExtendedString myFileName;
   //! Sizes of labels and some attributes that will be stored in the second pass

src_t/BinMDF/BinMDF_ADriverTable.cxx

@@ -90,12 +90,12 @@ const Handle(Standard_Type)& BinMDF_ADriverTable::AddDerivedDriver (Standard_CSt
 //=======================================================================
 
 void BinMDF_ADriverTable::AssignIds
-                (const TColStd_IndexedMapOfTransient& theTypes)
+                (const NCollection_IndexedMap<Handle(Standard_Type)>& theTypes)
 {
   myMapId.Clear();
   Standard_Integer i;
   for (i=1; i <= theTypes.Extent(); i++) {
-    Handle(Standard_Type) aType (Handle(Standard_Type)::DownCast (theTypes(i)));
+    const Handle(Standard_Type)& aType = theTypes(i);
     if (myMap.IsBound (aType)) {
       myMapId.Bind (aType, i);
     }
@@ -141,7 +141,8 @@ void BinMDF_ADriverTable::AssignIds
   {
     if (!myMapId.IsBound2 (aStrId.Value()))
     {
-      if (Handle(Standard_Type) anAdded = AddDerivedDriver (aStrId.Key().ToCString()))
+      Handle(Standard_Type) anAdded = AddDerivedDriver(aStrId.Key().ToCString());
+      if (!anAdded.IsNull())
       {
         myMapId.Bind (anAdded, aStrId.Value());
       }

src_t/BinMDF/BinMDF_ADriverTable.hxx

@@ -59,7 +59,7 @@ public:
   //! Assigns the IDs to the drivers of the given Types.
   //! It uses indices in the map as IDs.
   //! Useful in storage procedure.
-  Standard_EXPORT void AssignIds (const TColStd_IndexedMapOfTransient& theTypes);
+  Standard_EXPORT void AssignIds (const NCollection_IndexedMap<Handle(Standard_Type)>& theTypes);
 
   //! Assigns the IDs to the drivers of the given Type Names;
   //! It uses indices in the sequence as IDs.

src_t/BinMDataStd/BinMDataStd_GenericEmptyDriver.cxx

@@ -47,7 +47,7 @@ Handle(TDF_Attribute) BinMDataStd_GenericEmptyDriver::NewEmpty() const
 //=======================================================================
 const Handle(Standard_Type)& BinMDataStd_GenericEmptyDriver::SourceType() const
 {
-  return Standard_Type::Instance<TDataStd_GenericEmpty>();
+  return STANDARD_TYPE(TDataStd_GenericEmpty);
 }
 
 //=======================================================================

src_t/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx

@@ -47,7 +47,7 @@ Handle(TDF_Attribute) BinMDataStd_GenericExtStringDriver::NewEmpty() const
 //=======================================================================
 Handle(Standard_Type)& BinMDataStd_GenericExtStringDriver::SourceType() const
 {
-  static Handle(Standard_Type) aSourceType = Standard_Type::Instance<TDataStd_GenericExtString>();
+  static Handle(Standard_Type) aSourceType = STANDARD_TYPE(TDataStd_GenericExtString);
   return aSourceType;
 }
 

src_t/BinObjMgt/BinObjMgt_Position.hxx

@@ -15,6 +15,7 @@
 #define _BinObjMgt_Position_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
 class BinObjMgt_Position;
 DEFINE_STANDARD_HANDLE (BinObjMgt_Position, Standard_Transient)

src_t/BndLib/BndLib_Add2dCurve.cxx

@@ -842,12 +842,9 @@ Standard_Boolean BndLib_Box2dCurve::IsTypeBase
   (const Handle(Geom2d_Curve)& aC2D,
    GeomAbs_CurveType& aTypeB)
 {
-  Standard_Boolean bRet; 
-  Handle(Standard_Type) aType;
+  Standard_Boolean bRet=Standard_True;
   //
-  bRet=Standard_True;
-  //
-  aType=aC2D->DynamicType();
+  const Handle(Standard_Type)& aType = aC2D->DynamicType();
   if (aType==STANDARD_TYPE(Geom2d_Line)) {
     aTypeB=GeomAbs_Line;
   }

src_t/CDF/CDF_MetaDataDriver.hxx

@@ -18,6 +18,7 @@
 #define _CDF_MetaDataDriver_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
 class CDM_MetaData;
 class TCollection_ExtendedString;

src_t/DBRep/DBRep_DrawableShape.hxx

@@ -36,8 +36,7 @@ class gp_Trsf;
 //! list of edges and a list of faces.
 class DBRep_DrawableShape : public Draw_Drawable3D
 {
-  DEFINE_STANDARD_RTTIEXT(DBRep_DrawableShape, Draw_Drawable3D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DBRep_DrawableShape, Draw_Drawable3D)
 public:
 
   Standard_EXPORT DBRep_DrawableShape(const TopoDS_Shape& C, const Draw_Color& FreeCol, const Draw_Color& ConnCol, const Draw_Color& EdgeCol, const Draw_Color& IsosCol, const Standard_Real size, const Standard_Integer nbisos, const Standard_Integer discret);

src_t/Draw/Draw_Drawable3D.hxx

@@ -51,8 +51,9 @@ public:
 
   //! @def Draw_Drawable3D_FACTORY
   //! Auxiliary macros defining Draw_Drawable3D restoration API to sub-class.
-  #define Draw_Drawable3D_FACTORY \
-    static void RegisterFactory() { Draw_Drawable3D::RegisterFactory (get_type_name(), &Restore); } \
+  #define Draw_Drawable3D_FACTORY_RTTIEXT(Class,Base) \
+    DEFINE_STANDARD_RTTIEXT(Class, Base) \
+    static void RegisterFactory() { Draw_Drawable3D::RegisterFactory (#Class, &Restore); } \
     Standard_EXPORT static Handle(Draw_Drawable3D) Restore (Standard_IStream& theStream);
 
 public:

src_t/Draw/Draw_Number.hxx

@@ -24,8 +24,7 @@ DEFINE_STANDARD_HANDLE(Draw_Number, Draw_Drawable3D)
 //! To store numbers in variables.
 class Draw_Number : public Draw_Drawable3D
 {
-  DEFINE_STANDARD_RTTIEXT(Draw_Number, Draw_Drawable3D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(Draw_Number, Draw_Drawable3D)
 public:
 
   Standard_EXPORT Draw_Number (const Standard_Real theV);

src_t/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx

@@ -27,8 +27,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
 
 class DrawTrSurf_BSplineCurve : public DrawTrSurf_Curve
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
 public:
 
   //! creates a drawable BSpline curve from a BSpline curve of package Geom.

src_t/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx

@@ -27,8 +27,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
 
 class DrawTrSurf_BSplineCurve2d : public DrawTrSurf_Curve2d
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
 public:
 
   //! creates a drawable BSpline curve from a BSpline curve of package Geom2d.

src_t/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx

@@ -32,8 +32,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
 //! if you just want to sea boundaries and isoparametric curves.
 class DrawTrSurf_BSplineSurface : public DrawTrSurf_Surface
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
 public:
 
   //! default drawing mode.

src_t/DrawTrSurf/DrawTrSurf_BezierCurve.hxx

@@ -26,8 +26,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
 
 class DrawTrSurf_BezierCurve : public DrawTrSurf_Curve
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
 public:
 
   //! creates a drawable Bezier curve from a Bezier curve of package Geom.

src_t/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx

@@ -26,8 +26,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
 
 class DrawTrSurf_BezierCurve2d : public DrawTrSurf_Curve2d
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
 public:
 
   //! creates a drawable Bezier curve from a Bezier curve of package Geom2d.

src_t/DrawTrSurf/DrawTrSurf_BezierSurface.hxx

@@ -26,8 +26,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
 
 class DrawTrSurf_BezierSurface : public DrawTrSurf_Surface
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
 public:
 
   //! creates a drawable Bezier curve from a Bezier curve of package Geom.

src_t/DrawTrSurf/DrawTrSurf_Curve.hxx

@@ -29,8 +29,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve, DrawTrSurf_Drawable)
 //! This class defines a drawable curve in 3d space.
 class DrawTrSurf_Curve : public DrawTrSurf_Drawable
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve, DrawTrSurf_Drawable)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Curve, DrawTrSurf_Drawable)
 public:
 
   //! creates a drawable curve from a curve of package Geom.

src_t/DrawTrSurf/DrawTrSurf_Curve2d.hxx

@@ -29,8 +29,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
 //! The curve is drawn in the plane XOY.
 class DrawTrSurf_Curve2d : public DrawTrSurf_Drawable
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
 public:
 
   //! creates a drawable curve from a curve of package Geom2d.

src_t/DrawTrSurf/DrawTrSurf_Point.hxx

@@ -29,8 +29,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Point, Draw_Drawable3D)
 //! A drawable point.
 class DrawTrSurf_Point : public Draw_Drawable3D
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Point, Draw_Drawable3D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Point, Draw_Drawable3D)
 public:
 
   Standard_EXPORT DrawTrSurf_Point (const gp_Pnt& P, const Draw_MarkerShape Shape, const Draw_Color& Col);

src_t/DrawTrSurf/DrawTrSurf_Polygon2D.hxx

@@ -28,8 +28,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon2D, Draw_Drawable2D)
 //! Optional display of nodes.
 class DrawTrSurf_Polygon2D : public Draw_Drawable2D
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D, Draw_Drawable2D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Polygon2D, Draw_Drawable2D)
 public:
 
   Standard_EXPORT DrawTrSurf_Polygon2D (const Handle(Poly_Polygon2D)& P);

src_t/DrawTrSurf/DrawTrSurf_Polygon3D.hxx

@@ -28,8 +28,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon3D, Draw_Drawable3D)
 //! Optional display of nodes.
 class DrawTrSurf_Polygon3D : public Draw_Drawable3D
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D, Draw_Drawable3D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Polygon3D, Draw_Drawable3D)
 public:
 
   Standard_EXPORT DrawTrSurf_Polygon3D (const Handle(Poly_Polygon3D)& P);

src_t/DrawTrSurf/DrawTrSurf_Surface.hxx

@@ -29,8 +29,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Surface, DrawTrSurf_Drawable)
 //! With this class you can draw a general surface from package Geom.
 class DrawTrSurf_Surface : public DrawTrSurf_Drawable
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Surface, DrawTrSurf_Drawable)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Surface, DrawTrSurf_Drawable)
 public:
 
   //! default drawing mode

src_t/DrawTrSurf/DrawTrSurf_Triangulation.hxx

@@ -32,8 +32,7 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation, Draw_Drawable3D)
 //! Optional display of triangles and nodes indices.
 class DrawTrSurf_Triangulation : public Draw_Drawable3D
 {
-  DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Triangulation, Draw_Drawable3D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(DrawTrSurf_Triangulation, Draw_Drawable3D)
 public:
 
   Standard_EXPORT DrawTrSurf_Triangulation (const Handle(Poly_Triangulation)& T);

src_t/Express/Express.hxx

@@ -17,6 +17,7 @@
 #include <Standard_Boolean.hxx>
 #include <Standard_Type.hxx>
 #include <Standard_OStream.hxx>
+#include <Standard_Handle.hxx>
 
 class Express_Schema;
 class TCollection_AsciiString;

src_t/Express/Express_Field.hxx

@@ -15,6 +15,7 @@
 #define _Express_Field_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
 class Express_Type;
 class TCollection_HAsciiString;

src_t/Express/Express_Type.hxx

@@ -15,6 +15,7 @@
 #define _Express_Type_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
 class TCollection_AsciiString;
 

src_t/Geom2dAdaptor/Geom2dAdaptor_Curve.cxx

@@ -215,7 +215,7 @@ void Geom2dAdaptor_Curve::load(const Handle(Geom2d_Curve)& C,
     myNestedEvaluator.Nullify();
     myBSplineCurve.Nullify();
 
-    Handle(Standard_Type) TheType = C->DynamicType();
+    const Handle(Standard_Type)& TheType = C->DynamicType();
     if ( TheType == STANDARD_TYPE(Geom2d_TrimmedCurve)) {
       Load(Handle(Geom2d_TrimmedCurve)::DownCast (C)->BasisCurve(),
 	   UFirst,ULast);

src_t/HLRTest/HLRTest_Projector.hxx

@@ -26,8 +26,7 @@ DEFINE_STANDARD_HANDLE(HLRTest_Projector, Draw_Drawable3D)
 //! Draw Variable Projector to test.
 class HLRTest_Projector : public Draw_Drawable3D
 {
-  DEFINE_STANDARD_RTTIEXT(HLRTest_Projector, Draw_Drawable3D)
-  Draw_Drawable3D_FACTORY
+  Draw_Drawable3D_FACTORY_RTTIEXT(HLRTest_Projector, Draw_Drawable3D)
 public:
 
   Standard_EXPORT HLRTest_Projector(const HLRAlgo_Projector& P);

src_t/IFSelect/IFSelect_SignAncestor.cxx

@@ -32,9 +32,7 @@ Standard_Boolean IFSelect_SignAncestor::Matches(const Handle(Standard_Transient)
 						const TCollection_AsciiString& text,
 						const Standard_Boolean /*exact*/) const
 {
-  if (ent.IsNull()) return Standard_False;
-  DeclareAndCast(Standard_Type,atype,ent);
-  if (atype.IsNull()) atype = ent->DynamicType();
+  Handle(Standard_Type) atype = ent->DynamicType();
   return atype->SubType(text.ToCString());
 }
 

src_t/IFSelect/IFSelect_SignType.cxx

@@ -33,8 +33,7 @@ static Standard_CString nulsign = "";
    const Handle(Interface_InterfaceModel)& /*model*/) const
 {
   if (ent.IsNull()) return nulsign;
-  DeclareAndCast(Standard_Type,atype,ent);
-  if (atype.IsNull()) atype = ent->DynamicType();
+  Handle(Standard_Type) atype = ent->DynamicType();
   Standard_CString tn = atype->Name();
   if (!thenopk) return tn;
   for (int i = 0; tn[i] != '\0'; i ++) {

src_t/Interface/Interface_FileReaderTool.cxx

@@ -250,7 +250,7 @@ Standard_Boolean Interface_FileReaderTool::RecognizeByLib(const Standard_Integer
   }
   if (CN <= 0 || proto.IsNull()) return Standard_False;
 //   Se recaler dans GeneralLib : Creation de l entite vide
-  Handle(Standard_Type) typrot = proto->DynamicType();
+  const Handle(Standard_Type)& typrot = proto->DynamicType();
   for (glib.Start(); glib.More(); glib.Next()) {
     proto = glib.Protocol();
     if (proto.IsNull()) continue;

src_t/Interface/Interface_GTool.hxx

@@ -110,8 +110,8 @@ private:
   Handle(Interface_Protocol) theproto;
   Handle(Interface_SignType) thesign;
   Interface_GeneralLib thelib;
-  Interface_DataMapOfTransientInteger thentnum;
-  TColStd_IndexedDataMapOfTransientTransient thentmod;
+  NCollection_DataMap<Handle(Standard_Type),Standard_Integer> thentnum;
+  NCollection_IndexedDataMap<Handle(Standard_Type),Handle(Standard_Transient)> thentmod;
 
 
 };

src_t/Message/Message_Alert.hxx

@@ -17,6 +17,7 @@
 #define _Message_Alert_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
 DEFINE_STANDARD_HANDLE(Message_Alert, Standard_Transient)
 

src_t/Message/Message_Algorithm.cxx

@@ -223,13 +223,9 @@ void Message_Algorithm::SendStatusMessages (const Message_ExecStatus& theStatus,
 
     // find message, prefixed by class type name, iterating by base classes if necessary
     TCollection_AsciiString aMsgName;
-    for (Handle(Standard_Type) aType = DynamicType(); ! aType.IsNull(); aType = aType->Parent())
-    {
+    Handle(Standard_Type) aType = DynamicType();
       aMsgName = aType->Name();
       aMsgName += aSuffix;
-      if (Message_MsgFile::HasMsg(aMsgName))
-        break;
-    }
 
     // create a message
     Message_Msg aMsg ( aMsgName );

src_t/OSD/OSD_ThreadPool.cxx

@@ -76,7 +76,7 @@ void OSD_ThreadPool::EnumeratedThread::WaitIdle()
     myIdleEvent.Reset();
   }
 }
-
+#include <thread>
 // =======================================================================
 // function : DefaultPool
 // purpose  :

src_t/OpenGl/OpenGl_Element.hxx

@@ -17,6 +17,7 @@
 #define OpenGl_Element_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Handle.hxx>
 
 class Graphic3d_FrameStatsDataTmp;
 class OpenGl_Workspace;

src_t/OpenGl/OpenGl_Resource.hxx

@@ -17,6 +17,7 @@
 #define OpenGl_Resource_HeaderFile
 
 #include <Standard_Type.hxx>
+#include <Standard_Transient.hxx>
 
 class OpenGl_Context;