Changeset 3145 for trunk/psLib/src/sysUtils

Timestamp:

Feb 7, 2005, 1:26:25 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src/sysUtils

Files:

• psError.h (modified) (3 diffs)
• psMemory.h (modified) (9 diffs)
• psTrace.h (modified) (3 diffs)
• sysUtils.i (modified) (1 diff)

trunk/psLib/src/sysUtils/psError.h

@@ -12 +12 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:11 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-07 23:26:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -116 +116 @@
  *  @return psErrorCode    the given error code
  */
+#ifdef DOXYGEN
+psErrorCode psError(
+    psErrorCode code,                  ///< Error class code
+    psBool new,                        ///< true if error originates at this location
+    const char* fmt,
+    ...
+);
+#else
 psErrorCode p_psError(
     const char* file,
@@ -126 +134 @@
 );
 
+#ifndef SWIG
 #define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
+#endif
+
+#endif
 
 /** Create a new psErr struct

trunk/psLib/src/sysUtils/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-22 20:49:59 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-07 23:26:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -127 +127 @@
  *  @see psFree 
  */
-#ifdef DOXYGEN
+#if defined(DOXYGEN) || defined(SWIG)
 psPtr psAlloc(size_t size       ///< Size required
              );
-#else
-
+#endif
+
+#ifndef DOXYGEN
 psPtr p_psAlloc(size_t size,    ///< Size required
                 const char *file,       ///< File of call
@@ -138 +139 @@
 
 /// Memory allocation. psAlloc sends file and line number to p_psAlloc.
+#ifndef SWIG
 #define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__)
+#endif
+
 #endif
 
@@ -200 +204 @@
  *  @see psAlloc, psFree
  */
-#ifdef DOXYGEN
+#if defined(DOXYGEN) || defined(SWIG)
 psPtr psRealloc(
-    psPtr ptr                          ///< Pointer to re-allocate
-    size_t size,                       ///< Size required
-);
-#else
-
+    psPtr ptr,                          ///< Pointer to re-allocate
+    size_t size                         ///< Size required
+);
+#endif
+
+#ifndef DOXYGEN
 psPtr p_psRealloc(
     psPtr ptr,                         ///< Pointer to re-allocate
     size_t size,                       ///< Size required
     const char *file,                  ///< File of call
-    psS32 lineno                         ///< Line number of call
+    psS32 lineno                       ///< Line number of call
 );
 
 /// Memory re-allocation.  psRealloc sends file and line number to p_psRealloc.
+#ifndef SWIG
 #define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__)
+#endif
 
 #endif
@@ -223 +230 @@
  *  @see psAlloc, psRealloc
  */
-#ifdef DOXYGEN
+#if defined(DOXYGEN) || defined(SWIG)
 void psFree(
-    psPtr ptr,                         ///< Pointer to free, if NULL, function returns immediately.
-);
-#else
-
+    psPtr ptr                          ///< Pointer to free, if NULL, function returns immediately.
+);
+#endif
+
+#ifndef DOXYGEN
 void p_psFree(
-    psPtr ptr,                        ///< Pointer to free
-    const char *file,                 ///< File of call
-    psS32 lineno                        ///< Line number of call
+    psPtr ptr,                         ///< Pointer to free
+    const char *file,                  ///< File of call
+    psS32 lineno                       ///< Line number of call
 );
 
 /// Free memory.  psFree sends file and line number to p_psFree.
-#define psFree(size) p_psFree(size, __FILE__, __LINE__)
+#ifndef SWIG
+#define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__)
+#endif
 
 #endif
@@ -282 +292 @@
  *  @ingroup memRefCount
  */
-#ifdef DOXYGEN
+#if defined(DOXYGEN) || defined(SWIG)
 psPtr psMemIncrRefCounter(
     psPtr vptr                         ///< Pointer to increment refCounter, and return
 );
-#else
-
+#endif
+
+#ifndef DOXYGEN
 psPtr p_psMemIncrRefCounter(
     psPtr vptr,                        ///< Pointer to increment refCounter, and return
@@ -294 +305 @@
 );
 
+#ifndef SWIG
 #define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__)
+#endif
+
 #endif
 
@@ -304 +318 @@
  *                   fully dereferenced.
  */
-#ifdef DOXYGEN
+#if defined(DOXYGEN) || defined(SWIG)
 psPtr psMemDecrRefCounter(
     psPtr vptr                         ///< Pointer to decrement refCounter, and return
 );
-#else
-
+#endif
+
+#ifndef DOXYGEN
 psPtr p_psMemDecrRefCounter(
     psPtr vptr,                        ///< Pointer to decrement refCounter, and return
@@ -316 +331 @@
 );
 
+#ifndef SWIG
 #define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__)
+#endif
+
 #endif
 

trunk/psLib/src/sysUtils/psTrace.h

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 20:12:28 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-07 23:26:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
 p_psComponent;
 
-#ifndef DOXYGEN
+#ifdef DOXYGEN
+void psTrace(const char *facil,        ///< facilty of interest
+             psS32 myLevel,            ///< desired trace level
+             ...)                      ///< trace message arguments
+;
+#else
 /// Send a trace message
-void p_psTrace(const char *facil,       ///< facilty of interest
-               psS32 myLevel,     ///< desired trace level
-               ...)             ///< trace message arguments
+void p_psTrace(const char *facil,      ///< facilty of interest
+               psS32 myLevel,          ///< desired trace level
+               ...)                    ///< trace message arguments
 ;
+
+#ifndef SWIG
+#define psTrace(facil, level, ...) p_psTrace(facil, level, __VA_ARGS__)
+#endif
+
 #endif
 
@@ -89 +99 @@
 /* \} */// End of SystemGroup Functions
 
-#define psTrace(facil, level, ...) p_psTrace(facil, level, __VA_ARGS__)
 #endif
 

trunk/psLib/src/sysUtils/sysUtils.i

@@ -9 +9 @@
 %include "psTrace.h"
 %include "psType.h"
+
+%inline %{
+
+psErrorCode psError(psErrorCode code, psBool new, const char* msg) {
+    return p_psError("UNKNOWN",0,"SWIG",code,new,"%s",msg);
+}
+
+psPtr psAlloc(size_t size) {
+    return p_psAlloc(size,"UNKNOWN",0);
+}
+
+psPtr psRealloc(psPtr ptr, size_t size) {
+    return p_psRealloc(ptr,size,"UNKNOWN",0);
+}
+
+void psFree(psPtr ptr) {
+    p_psFree(ptr,"UNKNOWN",0);
+}
+
+psPtr psMemIncrRefCounter(psPtr vptr) {
+    return p_psMemIncrRefCounter(vptr,"UNKNOWN",0);
+}
+
+psPtr psMemDecrRefCounter(psPtr vptr) {
+    return p_psMemDecrRefCounter(vptr,"UNKNOWN",0);
+}
+
+void psTrace(const char* facil, psS32 myLevel, const char* msg) {
+    p_psTrace(facil, myLevel, msg);
+}
+
+%}