lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [12/14] lucy-clownfish git commit: Replace parcel_id with ParcelSpec pointer
Date Sat, 19 Mar 2016 17:27:22 GMT
Replace parcel_id with ParcelSpec pointer

This makes the check whether a class is in the same parcel thread-safe.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/25f58a6a
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/25f58a6a
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/25f58a6a

Branch: refs/heads/master
Commit: 25f58a6a5267ba8b33bbe00f8a25fa58c490e585
Parents: 8b71db6
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Thu Mar 10 21:19:21 2016 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Thu Mar 10 21:49:25 2016 +0100

----------------------------------------------------------------------
 runtime/core/Clownfish/Class.c   | 33 ++++-----------------------------
 runtime/core/Clownfish/Class.cfh | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/25f58a6a/runtime/core/Clownfish/Class.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Class.c b/runtime/core/Clownfish/Class.c
index 15cde2c..60434d2 100644
--- a/runtime/core/Clownfish/Class.c
+++ b/runtime/core/Clownfish/Class.c
@@ -50,9 +50,6 @@ S_set_name(Class *self, const char *utf8, size_t size);
 static Method*
 S_find_method(Class *self, const char *meth_name);
 
-static int32_t
-S_claim_parcel_id(void);
-
 static LockFreeRegistry *Class_registry;
 cfish_Class_bootstrap_hook1_t cfish_Class_bootstrap_hook1;
 
@@ -64,8 +61,6 @@ Class_bootstrap(const cfish_ParcelSpec *parcel_spec) {
     const InheritedMethSpec  *inherited_specs  = parcel_spec->inherited_specs;
     uint32_t num_classes = parcel_spec->num_classes;
 
-    int32_t parcel_id = S_claim_parcel_id();
-
     /* Pass 1:
      * - Allocate memory.
      * - Initialize global Class pointers.
@@ -107,7 +102,7 @@ Class_bootstrap(const cfish_ParcelSpec *parcel_spec) {
      * - Initialize IVARS_OFFSET.
      * - Initialize 'klass' ivar and refcount by calling Init_Obj.
      * - Initialize parent, flags, obj_alloc_size, class_alloc_size.
-     * - Assign parcel_id.
+     * - Assign parcel_spec.
      * - Initialize method pointers and offsets.
      */
     uint32_t num_novel      = 0;
@@ -122,7 +117,7 @@ Class_bootstrap(const cfish_ParcelSpec *parcel_spec) {
         if (spec->ivars_offset_ptr != NULL) {
             if (parent) {
                 Class *ancestor = parent;
-                while (ancestor && ancestor->parcel_id == parcel_id) {
+                while (ancestor && ancestor->parcel_spec == parcel_spec) {
                     ancestor = ancestor->parent;
                 }
                 ivars_offset = ancestor ? ancestor->obj_alloc_size : 0;
@@ -137,8 +132,8 @@ Class_bootstrap(const cfish_ParcelSpec *parcel_spec) {
         // values set in the previous pass or by another thread.
         Class_Init_Obj_IMP(CLASS, klass);
 
-        klass->parent    = parent;
-        klass->parcel_id = parcel_id;
+        klass->parent      = parent;
+        klass->parcel_spec = parcel_spec;
 
         // CLASS->obj_alloc_size must stay at 0.
         if (klass != CLASS) {
@@ -316,7 +311,6 @@ S_simple_subclass(Class *parent, String *name) {
 
     subclass->parent           = parent;
     subclass->flags            = parent->flags;
-    subclass->parcel_id        = parent->parcel_id;
     subclass->obj_alloc_size   = parent->obj_alloc_size;
     subclass->class_alloc_size = parent->class_alloc_size;
     subclass->methods          = (Method**)CALLOCATE(1, sizeof(Method*));
@@ -483,22 +477,3 @@ S_find_method(Class *self, const char *name) {
     return NULL;
 }
 
-static size_t parcel_count;
-
-static int32_t
-S_claim_parcel_id(void) {
-    // TODO: use ordinary cas rather than cas_ptr.
-    union { size_t num; void *ptr; } old_value;
-    union { size_t num; void *ptr; } new_value;
-
-    bool succeeded = false;
-    do {
-        old_value.num = parcel_count;
-        new_value.num = old_value.num + 1;
-        succeeded = Atomic_cas_ptr((void*volatile*)&parcel_count,
-                                   old_value.ptr, new_value.ptr);
-    } while (!succeeded);
-
-    return (int32_t)new_value.num;
-}
-

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/25f58a6a/runtime/core/Clownfish/Class.cfh
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/Class.cfh b/runtime/core/Clownfish/Class.cfh
index ab6e2b8..3ac602c 100644
--- a/runtime/core/Clownfish/Class.cfh
+++ b/runtime/core/Clownfish/Class.cfh
@@ -24,16 +24,16 @@ parcel Clownfish;
 
 public final class Clownfish::Class inherits Clownfish::Obj {
 
-    Class              *parent;
-    String             *name;
-    String             *name_internal;
-    uint32_t            flags;
-    int32_t             parcel_id;
-    uint32_t            obj_alloc_size;
-    uint32_t            class_alloc_size;
-    void               *host_type;
-    Method            **methods;
-    cfish_method_t[1]   vtable; /* flexible array */
+    Class                   *parent;
+    String                  *name;
+    String                  *name_internal;
+    uint32_t                 flags;
+    const cfish_ParcelSpec  *parcel_spec;
+    uint32_t                 obj_alloc_size;
+    uint32_t                 class_alloc_size;
+    void                    *host_type;
+    Method                 **methods;
+    cfish_method_t[1]        vtable; /* flexible array */
 
     inert uint32_t offset_of_parent;
 


Mime
View raw message