Changeset 66 for trunk/src

Timestamp:

Sep 25, 2005, 8:44:19 PM (19 years ago)

Author:

mmc

Message:

Cleaned up the app-fermi example so that it works the same way
across all of the various languages.

Added rpResult() function for reporting results. All programs
should all this to save out the XML before they exit. Also added
the fortran version rp_result().

Location:

trunk/src

Files:

• core/RpResult.cc (added)
• fortran/rappture_fortran.c (modified) (6 diffs)

trunk/src/fortran/rappture_fortran.c

@@ -32 +32 @@
 #   define rp_lib_xml              rp_lib_xml_
 #   define rp_quit                 rp_quit_
+#   define rp_result               rp_result_
 #elif defined(COMPNAME_ADD2UNDERSCORE)
 #   define rp_init                 rp_init__
@@ -57 +58 @@
 #   define rp_lib_xml              rp_lib_xml__
 #   define rp_quit                 rp_quit__
+#   define rp_result               rp_result__
 #elif defined(COMPNAME_NOCHANGE)
 #   define rp_init                 rp_init
@@ -82 +84 @@
 #   define rp_lib_xml              rp_lib_xml
 #   define rp_quit                 rp_quit
+#   define rp_result               rp_result
 #elif defined(COMPNAME_UPPERCASE)
 #   define rp_init                 RP_INIT
@@ -107 +110 @@
 #   define rp_lib_xml              RP_LIB_XML
 #   define rp_quit                 RP_QUIT
+#   define rp_result               RP_RESULT
 #endif
 
@@ -275 +279 @@
 extern "C"
 void rp_quit();
+
+extern "C"
+void rp_result(int* handle);
 
 
@@ -1308 +1315 @@
 }
 
+void rp_result(int* handle) {
+    PyObject* lib = NULL;
+
+    if (rapptureStarted && handle && *handle != 0) {
+        lib = getObject(*handle);
+        if (lib) {
+            rpResult(lib);
+        }
+    }
+    rp_quit();
+}
+
 int objType( char* flavor) 
 {