Changeset 6b32990 in git for Singular/silink.cc

Timestamp:

Dec 12, 2000, 9:44:55 AM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

de7793b9aaa39c2f00b6e30ee4ad5c82915497aa

Parents:

52ea3f939ec0aa2915d2d6a747bab3976eb9bfb7

Message:

* dynamic kernel modules for MP and DBM links
* p_Procs improvements


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

File:

• Singular/silink.cc (modified) (7 diffs)

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.37 2000-12-06 11:03:29 Singular Exp $ */
+/* $Id: silink.cc,v 1.38 2000-12-12 08:44:52 obachman Exp $ */
 
 /*
@@ -35 +35 @@
 static BOOLEAN DumpQring(FILE *fd, idhdl h, char *type_str);
 static BOOLEAN DumpAsciiMaps(FILE *fd, idhdl h, idhdl rhdl);
+static si_link_extension slTypeInit(si_link_extension s, const char* type);
 
 /* ====================================================================== */
@@ -83 +84 @@
   {
     si_link_extension s = si_link_root;
-
-    while (s != NULL && (strcmp(s->type, type) != 0)) s = s->next;
+    si_link_extension prev = s;
+
+    while (strcmp(s->type, type) != 0)
+    {
+      if (s->next == NULL) 
+      {
+        prev = s;
+        s = NULL;
+        break;
+      }
+      else
+      {
+        s = s->next;
+      }
+    }
 
     if (s != NULL)
@@ -90 +104 @@
     else
     {
-      Warn("Found unknown link type: %s", type);
-      Warn("Use default link type: %s", si_link_root->type);
-      l->m = si_link_root;
+      l->m = slTypeInit(prev, type);
     }
     omFree(type);
@@ -99 +111 @@
     l->m = si_link_root;
 
+  if (l->m == NULL) return TRUE;
+  
   l->name = (name != NULL ? name : omStrDup(""));
   l->mode = (mode != NULL ? mode : omStrDup(""));
@@ -809 +823 @@
 /*------------Initialization at Start-up time------------------------*/
 
+#include "slInit.h"
+
+static si_link_extension slTypeInit(si_link_extension s, const char* type)
+{
+  assume(s != NULL);
+  s->next = NULL;
+  si_link_extension ns = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
+  
+#ifdef HAVE_MPSR
+  if (strcmp(type, "MPfile") == 0)
+    s->next = slInitMPFileExtension(ns);
+  else if (strcmp(type, "MPtcp") == 0)
+    s->next = slInitMPTcpExtension(ns);
 #ifdef HAVE_DBM
-#include "sing_dbm.h"
-#endif
-
-#ifdef HAVE_MPSR
-#include "sing_mp.h"
-#endif
+  else
+#endif
+#endif
+#ifdef HAVE_DBM
+  if (strcmp(type, "DBM") == 0)
+    s->next = slInitDBMExtension(ns);
+#endif
+#if defined(HAVE_DBM) || defined(HAVE_MPSR)
+  else
+#endif
+  {
+    Warn("Found unknown link type: %s", type);
+    Warn("Use default link type: %s", si_link_root->type);
+    omFreeBin(ns, s_si_link_extension_bin);
+    return si_link_root;
+  }
+  
+  if (s->next == NULL)
+  {
+    Werror("Can not initialize link type %s", type);
+    omFreeBin(ns, s_si_link_extension_bin);
+    return NULL;
+  }
+  return s->next;
+}
 
 void slStandardInit()
@@ -832 +878 @@
   si_link_root->type="ASCII";
   s = si_link_root;
-#ifdef HAVE_DBM
-#ifndef HAVE_MODULE_DBM
-  s->next = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
-  s = s->next;
-  slInitDBMExtension(s);
-#endif
-#endif
-#ifdef HAVE_MPSR
-  s->next = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
-  s = s->next;
-  slInitMPFileExtension(s);
-  s->next = (si_link_extension)omAlloc0Bin(s_si_link_extension_bin);
-  s = s->next;
-  slInitMPTcpExtension(s);
-#endif
-}
+  s->next = NULL;
+}