pop message

Author: hannorein

rebound/simulation.py

@@ -250,14 +250,16 @@ def simulationarchive_filename(self):
 
 # Message and memory management functions
     def process_messages(self):
-        clibrebound.reb_simulation_get_next_message.restype = c_int
+        clibrebound.reb_pop_message.restype = c_int
+        clibrebound.reb_pop_message.argtypes = [c_void_p, c_char*1024]
         buf = create_string_buffer(c_int.in_dll(clibrebound, "reb_messages_max_length").value)
-        while clibrebound.reb_simulation_get_next_message(byref(self), buf):
-            msg = buf.value.decode("ascii")
-            if msg[0]=='w':
-                warnings.warn(msg[1:], RuntimeWarning)
-            elif msg[0]=='e':
-                raise RuntimeError(msg[1:])
+        if self.messages:
+            while clibrebound.reb_pop_message(self.messages, buf):
+                msg = buf.value.decode("ascii")
+                if msg[0]=='w':
+                    warnings.warn(msg[1:], RuntimeWarning)
+                elif msg[0]=='e':
+                    raise RuntimeError(msg[1:])
 
 # Pickling methods: return Simulationarchive binary
     def __reduce__(self):

src/rebound.c

@@ -112,18 +112,14 @@ void reb_simulation_error(struct reb_simulation* const r, const char* const msg)
     reb_message(r, 'e', msg);
 }
 
-void reb_simulation_stop(struct reb_simulation* const r){
-    r->status = REB_STATUS_USER;
-}
-
-int reb_simulation_get_next_message(struct reb_simulation* const r, char* const buf){
-    if (r->messages){
-        char* w0 = r->messages[0];
+int reb_pop_message(char** messages, char* const buf){
+    if (messages){
+        char* w0 = messages[0];
         if (w0){
             for(int i=0;i<reb_messages_max_N-1;i++){
-                r->messages[i] = r->messages[i+1];
+                messages[i] = messages[i+1];
             }
-            r->messages[reb_messages_max_N-1] = NULL;
+            messages[reb_messages_max_N-1] = NULL;
             strcpy(buf,w0);
             free(w0);
             return 1;

src/rebound_internal.h

@@ -65,11 +65,12 @@ DLLEXPORT extern const unsigned int reb_favicon_len;
 DLLEXPORT extern const int reb_messages_max_length;
 DLLEXPORT extern const int reb_messages_max_N;
 
-// Other functions. Mainly used by python. 
-// TODO: Put in other header files depending on implementation location.
+// Free any pointer. Alias for free(). Used by python.
 DLLEXPORT void reb_free(void* p);
-DLLEXPORT int reb_simulation_get_next_message(struct reb_simulation* const r, char* const buf); // Get the next stored warning message. Used only if save_messages==1. Return value is 0 if no messages are present, 1 otherwise.
-DLLEXPORT int reb_check_fp_contract(); // Returns 1 if floating point contraction are enabled. 0 otherwise.
+// Get the next stored warning message. Used only if save_messages==1. Return value is 0 if no messages are present, 1 otherwise.
+DLLEXPORT int reb_pop_message(char** messages, char* const buf); 
+// Returns 1 if floating point contraction are enabled. 0 otherwise. For unit testing.
+DLLEXPORT int reb_check_fp_contract(); 
 
 
 #endif // _REBOUND_INTERNAL_H

src/simulation.c

@@ -60,6 +60,11 @@ size_t reb_simulation_struct_size(){
     return sizeof(struct reb_simulation);
 }
 
+// User triggered stop.
+void reb_simulation_stop(struct reb_simulation* const r){
+    r->status = REB_STATUS_USER;
+}
+
 // Workaround for setting a pythong callback function. 
 void reb_simulation_set_collision_resolve(struct reb_simulation* r, enum REB_COLLISION_RESOLVE_OUTCOME (*resolve) (struct reb_simulation* const r, struct reb_collision c)){
     r->collision_resolve = resolve;