Changeset 22281 for v6

Timestamp:

09/18/08 19:46:04 (2 months ago)

Author:

ruoso

Message:

[smop] fixed two memory leaks. changed a bit the SMOP_LOWLEVEL_MEM_DEBUG code and added SMOP_MOLD_DEBUG and SMOP_SLIME_DEBUG that prints when it is evaluating some call both the name of the method as well as the type

Location:

v6/smop

Files:

• CMakeLists.txt (modified) (1 diff)
• include/smop_base.h (modified) (2 diffs)
• src/smop_lowlevel.sm0p (modified) (2 diffs)
• src/smop_mold.c (modified) (2 diffs)
• src/smop_s1p_array_iterator.sm0p (modified) (1 diff)
• src/smop_s1p_root_namespace.c (modified) (1 diff)
• src/smop_slime_node.c (modified) (1 diff)
• tools/ri (modified) (1 diff)

v6/smop/CMakeLists.txt

@@ -1 +1 @@
 project (smop)
 SET( CMAKE_C_FLAGS "-O0 -g3 -DSMOP_LOWLEVEL_MEM_TRACE" )
+#SET( CMAKE_C_FLAGS "-O0 -g3 -DSMOP_LOWLEVEL_MEM_TRACE -DSMOP_LOWLEVEL_MEM_DEBUG -DSMOP_MOLD_DEBUG -DSMOP_SLIME_DEBUG" )
 SET( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
 cmake_minimum_required (VERSION 2.6)

v6/smop/include/smop_base.h

@@ -85 +85 @@
 #ifdef SMOP_LOWLEVEL_MEM_DEBUG
 #define SMOP_REFERENCE(interpreter, object) \
-      (fprintf(stderr,"SMOP_REFERENCE(%p) at %s line %d file %s\n",object,__func__,__LINE__,__FILE__),\
+      (fprintf(stderr,"[SMOP_LOWLEVEL_MEM_DEBUG] ++ (%p) %s:%d (%s)\n",object,__FILE__,__LINE__,__func__),\
       (((SMOP__ResponderInterface*)(((SMOP__Object*)object)->RI)?(((SMOP__Object*)object)->RI):((SMOP__ResponderInterface*)object))->REFERENCE( (SMOP__Object*)interpreter, \
           ((SMOP__ResponderInterface*)(((SMOP__Object*)object)->RI)?(((SMOP__Object*)object)->RI):((SMOP__ResponderInterface*)object)), \
@@ -92 +92 @@
 
 #define SMOP_RELEASE(interpreter, object) \
-      (fprintf(stderr,"SMOP_RELEASE(%p) at %s line %d file %s\n",object,__func__,__LINE__,__FILE__), \
+      (fprintf(stderr,"[SMOP_LOWLEVEL_MEM_DEBUG] -- (%p) %s:%d (%s)\n",object,__FILE__,__LINE__,__func__),\
       (((SMOP__ResponderInterface*)(((SMOP__Object*)object)->RI)?(((SMOP__Object*)object)->RI):((SMOP__ResponderInterface*)object))->RELEASE( (SMOP__Object*)interpreter, \
           ((SMOP__ResponderInterface*)(((SMOP__Object*)object)->RI)?(((SMOP__Object*)object)->RI):((SMOP__ResponderInterface*)object)), \

v6/smop/src/smop_lowlevel.sm0p

@@ -162 +162 @@
 
 SMOP__Object* smop_lowlevel_refcnt_inc(SMOP__Object* interpreter, SMOP__ResponderInterface* ri, SMOP__Object* value) {
-#ifdef SMOP_LOWLEVEL_MEM_DEBUG
-  fprintf(stderr,"[SMOP_LOWLEVEL_MEM_DEBUG] refcont_inc: %p\n",value);
-#endif
   smop_lowlevel_wrlock(value);
   ((SMOP_LOWLEVEL_INTERNAL*)value->data)->ref_cnt++;
@@ -172 +169 @@
 
 SMOP__Object* smop_lowlevel_refcnt_dec(SMOP__Object* interpreter, SMOP__ResponderInterface* ri, SMOP__Object* value) {
-#ifdef SMOP_LOWLEVEL_MEM_DEBUG
-  fprintf(stderr,"[SMOP_LOWLEVEL_MEM_DEBUG] refcont_dec: %p\n",value);
-#endif
   smop_lowlevel_wrlock(value);
   ((SMOP_LOWLEVEL_INTERNAL*)value->data)->ref_cnt--;

v6/smop/src/smop_mold.c

@@ -258 +258 @@
         free(call_named);
         free(call_pos);
+
+#ifdef SMOP_MOLD_DEBUG
+        if (identifier && SMOP_RI(identifier) == SMOP_RI(SMOP__ID__new)) {
+          int u;
+          char* external = SMOP__NATIVE__idconst_fetch(call_identifier, &u);
+          char* local = malloc(u+1);
+          memcpy(local, external, u);
+          local[u] = 0;
+          fprintf(stderr, "[SMOP_MOLD_DEBUG] eval \"%s\" on \"%s\".\n", local, SMOP_RI(call_invocant)->id);
+          free(local);
+        } else {
+          fprintf(stderr, "[SMOP_MOLD_DEBUG] eval on \"%s\".\n", SMOP_RI(call_invocant)->id);
+        }
+#endif
+        
 
         SMOP__Object* ret = SMOP_DISPATCH(interpreter,SMOP_RI(call_invocant),call_identifier,capture);
@@ -292 +307 @@
         SMOP__Object* call_capture = get_register(interpreter,frame);
 
+#ifdef SMOP_MOLD_DEBUG
+        if (identifier && SMOP_RI(identifier) == SMOP_RI(SMOP__ID__new)) {
+          int u;
+          char* external = SMOP__NATIVE__idconst_fetch(call_identifier, &u);
+          char* local = malloc(u+1);
+          memcpy(local, external, u);
+          local[u] = 0;
+          fprintf(stderr, "[SMOP_MOLD_DEBUG] eval \"%s\" on \"%s\".\n", local, ((SMOP__ResponderInterface*)call_responder)->id);
+          free(local);
+        } else {
+          fprintf(stderr, "[SMOP_MOLD_DEBUG] eval on \"%s\".\n", ((SMOP__ResponderInterface*)call_responder)->id);
+        }
+#endif
+
         SMOP__Object* ret = SMOP_DISPATCH(interpreter,SMOP_RI(call_responder),call_identifier,call_capture);
         SMOP_RELEASE(interpreter,call_responder);

v6/smop/src/smop_s1p_array_iterator.sm0p

@@ -46 +46 @@
     mold_reg_set(interpreter,frame,0,SMOP_REFERENCE(interpreter,interpreter));
     mold_reg_set(interpreter,frame,1,SMOP_REFERENCE(interpreter,capture));
-    mold_reg_set(interpreter,frame,2,SMOP_REFERENCE(interpreter,back));
+    mold_reg_set(interpreter,frame,2,back);
 
     SMOP_DISPATCH(interpreter,SMOP_RI(interpreter),SMOP__ID__goto,frame);

v6/smop/src/smop_s1p_root_namespace.c

@@ -24 +24 @@
 void smop_s1p_root_namespace_init() {
   SMOP__S1P__RootNamespace = SMOP__S1P__Hash_create();
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Hash",SMOP__S1P__Hash_create());
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Array",SMOP__S1P__Array_create());
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"$*OUT",SMOP__S1P__IO_create(SMOP__GlobalInterpreter));
-  //smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Code",SMOP__S1P__Code_create(SMOP__NATIVE__bool_false));
-  SMOP__Object* mold = SMOP__Mold_create(0,(SMOP__Object*[]) { NULL },1,(int[]) { 0 });
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Mold",SMOP_REFERENCE(SMOP__GlobalInterpreter,mold));
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::MoldFrame",SMOP__Mold__Frame_create(SMOP__GlobalInterpreter,mold));
-  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Code",SMOP__S1P__Code_create());
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Hash", SMOP__S1P__Hash);
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Array", SMOP__S1P__Array);
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"$*OUT", SMOP__S1P__IO_create(SMOP__GlobalInterpreter));
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Mold", SMOP__Mold);
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::MoldFrame", SMOP__Mold__Frame);
+  smop_s1p_root_namespace_insert(SMOP__GlobalInterpreter,"::Code", SMOP__S1P__Code);
 }
 

v6/smop/src/smop_slime_node.c

@@ -181 +181 @@
       memcpy(local, external, u);
       local[u] = 0;
-      fprintf(stderr, "[node] eval \"%s\".\n", local);
+      fprintf(stderr, "[SMOP_SLIME_DEBUG] eval \"%s\" on \"%s\".\n", local, ((SMOP__ResponderInterface*)responder));
       free(local);
     } else {
-      fprintf(stderr, "[node] eval.\n");
+      fprintf(stderr, "[SMOP_SLIME_DEBUG] eval on \"%s\".\n", ((SMOP__ResponderInterface*)responder));
     }
 #endif

v6/smop/tools/ri

@@ -96 +96 @@
   }
 
+  if (invocant) SMOP_RELEASE(interpreter,invocant);
   SMOP_RELEASE(interpreter,capture);
   return ret;