Changeset d8f7a6 in git

Timestamp:

Aug 23, 2012, 12:23:46 AM (12 years ago)

Author:

Alexander Dreyer <alexander.dreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a9bb741e5bd039dd27b862fdf1ca1f5b0f092216

Parents:

babfe48c6b91ec9f26e998cdcf95c8df192b1c05

git-author:

Alexander Dreyer <alexander.dreyer@itwm.fraunhofer.de>2012-08-23 00:23:46+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-09-05 15:52:16+02:00

Message:

fix: handling local idroot

File:

• Singular/countedref.cc (modified) (3 diffs)

Singular/countedref.cc

@@ -79 +79 @@
     if (myroot == NULL) {
       myroot = enterid(" _shared_data_ ", 0, PACKAGE_CMD, &IDROOT, TRUE);
+      IDPACKAGE(myroot) = (package)omAlloc0(sizeof(*basePack));
+      IDPACKAGE(myroot)->idroot = idrec().set(omStrDup("last"), 0, DEF_CMD, FALSE);
+      IDNEXT(IDPACKAGE(myroot)->idroot) = NULL;
     }
     return &myroot;
@@ -88 +91 @@
     sprintf(name, " :%u:%p:_shared_: ", ++counter, data);
 
-    idhdl* root = locals();
-    short ref = ++(*root)->ref;
-
+    idhdl* root;
+
+    if (RingDependend(typ))
+      root = &currRing->idroot;
+    else {
+      root = &IDPACKAGE(*locals())->idroot;
+      ++(IDPACKAGE(*locals())->ref);
+    }
     assume((*root)->get(name, 0) == NULL); 
-    (*root) = (*root)->set(name, 0, typ, FALSE);
+    (*root) = (*root)->set(omStrDup(name), 0, typ, FALSE);
+
     assume((*root) != NULL);
     IDDATA(*root) = (char*) data;
-    (*root)->ref = ref;
+    ++(IDPACKAGE(*locals())->ref);
 
     return *root;
@@ -101 +110 @@
 
   static void erase(idhdl handle) {
-
-    idhdl* root = locals();
-    short ref = --((*root)->ref);
+    idhdl* root;
+    if (RingDependend(IDTYP(handle)))
+      root = &currRing->idroot;
+    else {
+      root = &IDPACKAGE(*locals())->idroot;
+      (--IDPACKAGE(*locals())->ref);
+    }
     killhdl2(handle, root, currRing);
-    (*root)->ref = ref;
-
-    if(ref <= 0) {
+
+    if((IDPACKAGE(*locals())->ref) <= 0) {
       killhdl2(*root, &IDROOT, currRing);
       (*root) = NULL;