Changeset 15089

Timestamp:

05/23/13 20:50:29 (12 years ago)

Author:

Eric.Larour

Message:

CHG: starting transition to better print i/o

Location:

issm/trunk-jpl/src/c/shared/io/Print

Files:

• Print.h (modified) (2 diffs)
• PrintfFunction.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/shared/io/Print/Print.h

@@ -24 +24 @@
 /*}}}*/
 /* _printLine_ {{{*/
-/* macro to print a line, adds std::endl */
+/* macro to print a line, adds std::endl, only on cpu 0 */
 #define _printLine_(StreamArgs)\
-   do{std::cout << StreamArgs << std::endl;}while(0)
+  do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+          aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+          PrintfFunction3(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
 /*}}}*/
 /* _printString_ {{{*/
-/* macro to print some string */
+/* macro to print some string. Only on cpu0 */
 #define _printString_(StreamArgs)\
-   do{std::cout << StreamArgs;}while(0)
+  do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+          aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+          PrintfFunction4(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
 /*}}}*/
 /* _pprintLine_ {{{*/
@@ -52 +56 @@
 int PrintfFunction(const string & message);
 int PrintfFunction2(const string & message);
+int PrintfFunction3(const string & message);
+int PrintfFunction4(const string & message);
 
 #endif  

issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp

@@ -87 +87 @@
         return 1;
 }
+int PrintfFunction3(const string & message){
+
+        #ifdef _HAVE_ANDROID_JNI_
+        __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
+        #else
+        printf("%s\n",message.c_str());
+        #endif
+
+        return 1;
+}
+int PrintfFunction4(const string & message){
+
+        printf("%s",message.c_str());
+
+        return 1;
+}