Fixed memory protection conditions (now that I finally have a GC test case) and imple...

diff --git a/Console.cpp b/Console.cpp
index d938217b353dd33797902784b70c3b28a96db8e8..fdfc05449ec2c71f41aa71ab64975adfad488557 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -66,10 +66,29 @@
 #include <netinet/in.h>
 #include <sys/un.h>
 
 #include <netinet/in.h>
 #include <sys/un.h>
 

+static volatile enum {
+    Working,
+    Parsing,
+    Running,
+    Sending,
+    Waiting,
+} mode_;
+

 static jmp_buf ctrlc_;
 
 static void sigint(int) {
 static jmp_buf ctrlc_;
 
 static void sigint(int) {

-    longjmp(ctrlc_, 1);
+    switch (mode_) {
+        case Working:
+            return;
+        case Parsing:
+            longjmp(ctrlc_, 1);
+        case Running:
+            throw "*** Ctrl-C";
+        case Sending:
+            return;
+        case Waiting:
+            return;
+    }

 }
 
 void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {
 }
 
 void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) {


@@ -77,12 +96,16 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
 
     const char *json;
     if (socket == -1) {
 
     const char *json;
     if (socket == -1) {

+        mode_ = Running;

         json = CYExecute(pool, data);
         json = CYExecute(pool, data);

+        mode_ = Working;

         if (json != NULL)
             size = strlen(json);
     } else {
         if (json != NULL)
             size = strlen(json);
     } else {

+        mode_ = Sending;

         CYSendAll(socket, &size, sizeof(size));
         CYSendAll(socket, data, size);
         CYSendAll(socket, &size, sizeof(size));
         CYSendAll(socket, data, size);

+        mode_ = Waiting;

         CYRecvAll(socket, &size, sizeof(size));
         if (size == _not(size_t))
             json = NULL;
         CYRecvAll(socket, &size, sizeof(size));
         if (size == _not(size_t))
             json = NULL;


@@ -92,6 +115,7 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
             temp[size] = '\0';
             json = temp;
         }
             temp[size] = '\0';
             json = temp;
         }

+        mode_ = Working;

     }
 
     if (json != NULL && fout != NULL) {
     }
 
     if (json != NULL && fout != NULL) {


@@ -147,13 +171,16 @@ static void Console(int socket) {
         const char *prompt("cy# ");
 
         if (setjmp(ctrlc_) != 0) {
         const char *prompt("cy# ");
 
         if (setjmp(ctrlc_) != 0) {

+            mode_ = Working;

             fputs("\n", fout);
             fflush(fout);
             goto restart;
         }
 
       read:
             fputs("\n", fout);
             fflush(fout);
             goto restart;
         }
 
       read:

+        mode_ = Parsing;

         char *line(readline(prompt));
         char *line(readline(prompt));

+        mode_ = Working;

         if (line == NULL)
             break;
 
         if (line == NULL)
             break;
 

diff --git a/Library.mm b/Library.mm
index e292511a067cac5d381f86d9d7f291c9a0032f5f..66c752341ad090c760ef1275f79243dc780a6a48 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -327,6 +327,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, id self) {
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);
 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
     JSObjectSetPrototype(context, object, prototype);
 

+    JSValueProtect(context, object);

     value = object;
     return object;
 }
     value = object;
     return object;
 }


@@ -395,19 +396,41 @@ struct Messages :
     }
 };
 
     }
 };
 

-struct Internal :
+struct CYOwned :

     CYValue
 {
     CYValue
 {

+  private:
+    JSContextRef context_;

     JSObjectRef owner_;
 
     JSObjectRef owner_;
 

-    Internal(id value, JSObjectRef owner) :
+  public:
+    CYOwned(void *value, JSContextRef context, JSObjectRef owner) :

         CYValue(value),
         CYValue(value),

+        context_(context),

         owner_(owner)
         owner_(owner)

+    {
+        JSValueProtect(context_, owner_);
+    }
+
+    virtual ~CYOwned() {
+        JSValueUnprotect(context_, owner_);
+    }
+
+    JSObjectRef GetOwner() const {
+        return owner_;
+    }
+};
+
+struct Internal :
+    CYOwned
+{
+    Internal(id value, JSContextRef context, JSObjectRef owner) :
+        CYOwned(value, context, owner)

     {
     }
 
     static JSObjectRef Make(JSContextRef context, id object, JSObjectRef owner) {
     {
     }
 
     static JSObjectRef Make(JSContextRef context, id object, JSObjectRef owner) {

-        return JSObjectMake(context, Internal_, new Internal(object, owner));
+        return JSObjectMake(context, Internal_, new Internal(object, context, owner));

     }
 
     id GetValue() const {
     }
 
     id GetValue() const {


@@ -580,27 +603,24 @@ Type_privateData *Selector_privateData::GetType() const {
 }
 
 struct Pointer :
 }
 
 struct Pointer :

-    CYValue
+    CYOwned

 {
 {

-    JSObjectRef owner_;

     Type_privateData *type_;
 
     Type_privateData *type_;
 

-    Pointer(void *value, sig::Type *type, JSObjectRef owner) :
-        CYValue(value),
-        owner_(owner),
+    Pointer(void *value, JSContextRef context, JSObjectRef owner, sig::Type *type) :
+        CYOwned(value, context, owner),

         type_(new(pool_) Type_privateData(type))
     {
     }
 };
 
 struct Struct_privateData :
         type_(new(pool_) Type_privateData(type))
     {
     }
 };
 
 struct Struct_privateData :

-    CYValue
+    CYOwned

 {
 {

-    JSObjectRef owner_;

     Type_privateData *type_;
 
     Type_privateData *type_;
 

-    Struct_privateData(JSObjectRef owner) :
-        owner_(owner)
+    Struct_privateData(JSContextRef context, JSObjectRef owner) :
+        CYOwned(NULL, context, owner)

     {
     }
 };
     {
     }
 };


@@ -609,7 +629,7 @@ typedef std::map<const char *, Type_privateData *, CStringMapLess> TypeMap;
 static TypeMap Types_;
 
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
 static TypeMap Types_;
 
 JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {

-    Struct_privateData *internal(new Struct_privateData(owner));
+    Struct_privateData *internal(new Struct_privateData(context, owner));

     apr_pool_t *pool(internal->pool_);
     Type_privateData *typical(new(pool) Type_privateData(type, ffi));
     internal->type_ = typical;
     apr_pool_t *pool(internal->pool_);
     Type_privateData *typical(new(pool) Type_privateData(type, ffi));
     internal->type_ = typical;


@@ -651,9 +671,16 @@ struct Closure_privateData :
     JSContextRef context_;
     JSObjectRef function_;
 
     JSContextRef context_;
     JSObjectRef function_;
 

-    Closure_privateData(const char *type) :
-        Functor_privateData(type, NULL)
+    Closure_privateData(JSContextRef context, JSObjectRef function, const char *type) :
+        Functor_privateData(type, NULL),
+        context_(context),
+        function_(function)

     {
     {

+        JSValueProtect(context_, function_);
+    }
+
+    virtual ~Closure_privateData() {
+        JSValueUnprotect(context_, function_);

     }
 };
 
     }
 };
 


@@ -1697,7 +1724,7 @@ JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
 }
 
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {
 }
 
 JSObjectRef CYMakePointer(JSContextRef context, void *pointer, sig::Type *type, ffi_type *ffi, JSObjectRef owner) {

-    Pointer *internal(new Pointer(pointer, type, owner));
+    Pointer *internal(new Pointer(pointer, context, owner, type));

     return JSObjectMake(context, Pointer_, internal);
 }
 
     return JSObjectMake(context, Pointer_, internal);
 }
 


@@ -1985,7 +2012,7 @@ void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
 Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
     // XXX: in case of exceptions this will leak
     // XXX: in point of fact, this may /need/ to leak :(
 Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
     // XXX: in case of exceptions this will leak
     // XXX: in point of fact, this may /need/ to leak :(

-    Closure_privateData *internal(new Closure_privateData(type));
+    Closure_privateData *internal(new Closure_privateData(CYGetJSContext(), function, type));

 
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),
 
     ffi_closure *closure((ffi_closure *) _syscall(mmap(
         NULL, sizeof(ffi_closure),


@@ -2000,9 +2027,6 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
 
     internal->value_ = closure;
 
 
     internal->value_ = closure;
 

-    internal->context_ = CYGetJSContext();
-    internal->function_ = function;
-

     return internal;
 }
 
     return internal;
 }
 


@@ -2385,7 +2409,7 @@ static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object,
 
 static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
 
 static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));

-    return internal->owner_;
+    return internal->GetOwner();

 }
 
 bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {
 }
 
 bool Index_(apr_pool_t *pool, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) {


@@ -2440,7 +2464,7 @@ static JSValueRef Pointer_getIndex(JSContextRef context, JSObjectRef object, siz
     uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
     base += ffi->size * index;
 
     uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
     base += ffi->size * index;
 

-    JSObjectRef owner(internal->owner_ ?: object);
+    JSObjectRef owner(internal->GetOwner() ?: object);

 
     CYTry {
         return CYFromFFI(context, typical->type_, ffi, base, false, owner);
 
     CYTry {
         return CYFromFFI(context, typical->type_, ffi, base, false, owner);


@@ -2517,7 +2541,7 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J
     if (!Index_(pool, internal, property, index, base))
         return NULL;
 
     if (!Index_(pool, internal, property, index, base))
         return NULL;
 

-    JSObjectRef owner(internal->owner_ ?: object);
+    JSObjectRef owner(internal->GetOwner() ?: object);

 
     CYTry {
         return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);
 
     CYTry {
         return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner);


@@ -3259,7 +3283,14 @@ const char *CYExecute(apr_pool_t *pool, const char *code) { _pooled
     if (JSValueIsUndefined(context, result))
         return NULL;
 
     if (JSValueIsUndefined(context, result))
         return NULL;
 

-    const char *json(CYPoolCCYON(pool, context, result, &exception));
+    const char *json;
+
+    try {
+        json = CYPoolCCYON(pool, context, result, &exception);
+    } catch (const char *error) {
+        return error;
+    }
+

     if (exception != NULL)
         goto error;
 
     if (exception != NULL)
         goto error;
 


@@ -3520,7 +3551,6 @@ JSGlobalContextRef CYGetJSContext() {
         definition.className = "ObjectiveC::Image::Classes";
         definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
         definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;
         definition.className = "ObjectiveC::Image::Classes";
         definition.getProperty = &ObjectiveC_Image_Classes_getProperty;
         definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames;

-        definition.finalize = &Finalize;

         ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
 
         definition = kJSClassDefinitionEmpty;
         ObjectiveC_Image_Classes_ = JSClassCreate(&definition);
 
         definition = kJSClassDefinitionEmpty;


@@ -3599,6 +3629,18 @@ JSGlobalContextRef CYGetJSContext() {
         CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
 
         Result_ = JSStringCreateWithUTF8CString("_");
         CYSetProperty(context, System_, CYJSString("print"), JSObjectMakeFunctionWithCallback(context, CYJSString("print"), &System_print));
 
         Result_ = JSStringCreateWithUTF8CString("_");

+
+        JSValueProtect(context, Array_);
+        JSValueProtect(context, Function_);
+        JSValueProtect(context, String_);
+
+        JSValueProtect(context, Instance_prototype_);
+        JSValueProtect(context, Object_prototype_);
+
+        JSValueProtect(context, Array_prototype_);
+        JSValueProtect(context, Array_pop_);
+        JSValueProtect(context, Array_push_);
+        JSValueProtect(context, Array_splice_);

     }
 
     return Context_;
     }
 
     return Context_;