Changeset 8c35ba in git

Timestamp:

Feb 23, 2008, 6:56:03 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

4d2ab5c1e54b41b2b02f7720e375b7983a98b89b

Parents:

00c89cb3475f67740a01779e6452fe57c1b0fabe

Message:

*hannes: MP_ReleaseEnv


git-svn-id: file:///usr/local/Singular/svn/trunk@10601 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/mpsr_sl.cc (modified) (4 diffs)
• kernel/misc.cc (modified) (3 diffs)

Singular/mpsr_sl.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: mpsr_sl.cc,v 1.7 2008-02-23 17:27:25 Singular Exp $
+ *  Version: $Id: mpsr_sl.cc,v 1.8 2008-02-23 17:55:46 Singular Exp $
  *******************************************************************/
 
@@ -40 +40 @@
 #endif
 
-extern MP_Env_pt mp_Env;
+static MP_Env_pt mp_Env=NULL;
+extern void (*MP_Exit_Env_Ptr)();
 
 /* =============== general utilities ====================================== */
+static void MP_Exit_Env_sl()
+{ MP_ReleaseEnv(mp_Env); mp_Env=NULL; }
 static void FreeCmdArgs(int argc, char** argv)
 {
@@ -154 +157 @@
     return TRUE;
   }
+  MP_Exit_Env_Ptr=MP_Exit_Env_sl;
+
 
   if ((link = MP_OpenLink(mp_Env, 6, argv)) == NULL)
@@ -314 +319 @@
     return TRUE;
   }
+  MP_Exit_Env_Ptr=MP_Exit_Env_sl;
 
   if (strcmp(l->mode, "connect") == 0) link = slOpenMPConnect(argc, argv);

kernel/misc.cc

@@ -14 +14 @@
 
 #include "mod2.h"
-#ifdef HAVE_MPSR
-#include<MP.h>
-#endif
 #include <mylimits.h>
 #include "omalloc.h"
@@ -77 +74 @@
 * the global exit routine of Singular
 */
+#ifdef HAVE_MPSR
+void (*MP_Exit_Env_Ptr)()=NULL;
+#endif
 extern "C" {
-#ifdef HAVE_MPSR
-MP_Env_pt mp_Env = NULL;
-#endif
 
 void m2_end(int i)
@@ -123 +120 @@
   }
   #ifdef HAVE_MPSR
-  /* if (mp_Env!=NULL)*/ MP_ReleaseEnv(mp_Env);
+  if (MP_Exit_Env_Ptr!=NULL) (*MP_Exit_Env_Ptr)();
   #endif
   exit(i);