readapt 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e935059da5afc7fe4f6a68e6574ad096dcf90c2b166b81f3c0e50260e3d740ba
-  data.tar.gz: 26f8dce0349345c4f0fa5953f179e833c8848e5cf90f57632661f97603967d4b
+  metadata.gz: ad64fe3f51193626e5680b735f161da45661c7aba6cede8c1b46fa92e3d19cad
+  data.tar.gz: 52a5fc764ca16387d5e0c9a18bbf17f183bdf81de5ce87bfed3104060df68f3c
 SHA512:
-  metadata.gz: 979309cb99c3e4eb81768965b2a564ae14dd057f424383b28ae4e9f4a38dded3a2afc135aaca70d04207e470fd241c195ed207ae4712e98e6efbf19ae79ec6a2
-  data.tar.gz: a22d57be02bb01fb3535cb7c6c3047dcb33ec6a132ead776dbea44022924cfe026de4e99eb28632e6690a3a0e920f78d2131f2a7f5dac70ecb6dda939b79e4fb
+  metadata.gz: 7f3ec831e7e0c0a998083407b09e14a7c2217394ab0b606e00b5d13862ba1f8b5fb1e84fd903541661717ba4b177c558d8150ec2bb026393847bbd491877eace
+  data.tar.gz: d554b97e4f41d461ce33d0f9ebcf1b282e8b06da5a0a9a2dfdbdecb85ac585f4a0373a6068c5b9d6786449645181900ca848a6ecc4db1c49cee772a4cce736cb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.5.0 = August 20, 2019
+- Monitor stores paths as C strings
+- Fixed malloc size for normalized paths
+- Fixed table insertion before existing items
+
 # 0.4.0 - August 19. 2019
 - Breakpoints use C implementation of hash tables
 - Simplified entry point detection

data/ext/readapt/hash_table.c

@@ -158,34 +158,30 @@ static void ht_insert_key(ht_hash_table *ht, char *key, const long *value, const
     item = ht_new_item(key, value, size);
     tmp = malloc(sizeof(ht_item) * (ht->size + 1));
 
-    for (i = 0; i <= ht->size; i++)
+    for (i = 0; i < ht->size; i++)
     {
         if (!inserted)
         {
-            if (i == ht->size)
+            cmp = strcmp(item->key, ht->items[i]->key);
+            if (cmp > 0)
             {
-                tmp[i] = item;
+                tmp[cursor] = item;
+                cursor++;
                 inserted = 1;
             }
-            else
-            {
-                cmp = strcmp(item->key, ht->items[i]->key);
-                if (cmp > 0)
-                {
-                    tmp[i] = item;
-                    tmp[i + 1] = ht->items[cursor];
-                    inserted = 1;
-                    cursor++;
-                    i++;
-                }
-            }
+            tmp[cursor] = ht->items[i];
+            cursor++;
         }
         else
         {
-            tmp[i] = ht->items[cursor];
+            tmp[cursor] = ht->items[i];
             cursor++;
         }
     }
+    if (!inserted)
+    {
+        tmp[ht->size] = item;
+    }
     free(ht->items);
     ht->items = tmp;
     ht->size++;

data/ext/readapt/monitor.c

@@ -16,7 +16,7 @@ static VALUE tpThreadBegin;
 static VALUE tpThreadEnd;
 static VALUE debugProc;
 static int firstLineEvent = 0;
-static VALUE entryFile;
+static char *entryFile;
 
 static ID id_continue;
 static ID id_pause;
@@ -44,7 +44,7 @@ static int match_step(thread_reference_t *ptr)
 }
 
 static ID
-monitor_debug(VALUE file, long line, VALUE tracepoint, thread_reference_t *ptr, ID event)
+monitor_debug(const char *file, const long line, VALUE tracepoint, thread_reference_t *ptr, ID event)
 {
 	VALUE bind, bid, snapshot, result;
 
@@ -53,7 +53,7 @@ monitor_debug(VALUE file, long line, VALUE tracepoint, thread_reference_t *ptr,
 	snapshot = rb_funcall(c_Snapshot, rb_intern("new"), 7,
 		LONG2NUM(ptr->id),
 		bid,
-		file,
+		rb_str_new_cstr(file),
 		INT2NUM(line),
 		Qnil,
 		ID2SYM(event),
@@ -74,7 +74,8 @@ monitor_debug(VALUE file, long line, VALUE tracepoint, thread_reference_t *ptr,
 static void
 process_line_event(VALUE tracepoint, void *data)
 {
-	VALUE ref, tp_file;
+	VALUE ref, tmp;
+	char *tp_file;
 	long tp_line;
 	thread_reference_t *ptr;
 	rb_trace_arg_t *tp;
@@ -93,13 +94,14 @@ process_line_event(VALUE tracepoint, void *data)
 				return;
 			}
 			tp = rb_tracearg_from_tracepoint(tracepoint);
-			tp_file = normalize_path(rb_tracearg_path(tp));
+			tmp = rb_tracearg_path(tp);
+			tp_file = normalize_path_new_cstr(StringValueCStr(tmp));
 			tp_line = NUM2LONG(rb_tracearg_lineno(tp));
 
 			dapEvent = id_continue;
 			if (!firstLineEvent)
 			{
-				if (rb_str_equal(tp_file, entryFile))
+				if (strcmp(tp_file, entryFile) == 0)
 				{
 					firstLineEvent = 1;
 					ptr->control = rb_intern("entry");
@@ -114,7 +116,7 @@ process_line_event(VALUE tracepoint, void *data)
 			{
 				dapEvent = rb_intern("step");
 			}
-			else if (breakpoints_match(StringValueCStr(tp_file), tp_line))
+			else if (breakpoints_match(tp_file, tp_line))
 			{
 				dapEvent = rb_intern("breakpoint");
 			}
@@ -127,6 +129,8 @@ process_line_event(VALUE tracepoint, void *data)
 			{
 				monitor_debug(tp_file, tp_line, tracepoint, ptr, dapEvent);
 			}
+
+			free(tp_file);
 		}
 	}
 }
@@ -162,7 +166,7 @@ process_return_event(VALUE tracepoint, void *data)
 static void
 process_thread_begin_event(VALUE tracepoint, void *data)
 {
-	VALUE list, here, prev, ref;
+	VALUE list, here, prev, ref, tmp;
 	thread_reference_t *ptr;
 
 	list = rb_funcall(rb_cThread, rb_intern("list"), 0);
@@ -178,8 +182,9 @@ process_thread_begin_event(VALUE tracepoint, void *data)
 				{
 					ref = thread_add_reference(here);
 					ptr = thread_reference_pointer(ref);
+					tmp = rb_funcall(tracepoint, rb_intern("path"), 0);
 					monitor_debug(
-						rb_funcall(tracepoint, rb_intern("path"), 0),
+						StringValueCStr(tmp),
 						NUM2LONG(rb_funcall(tracepoint, rb_intern("lineno"), 0)),
 						tracepoint,
 						ptr,
@@ -194,7 +199,7 @@ process_thread_begin_event(VALUE tracepoint, void *data)
 static void
 process_thread_end_event(VALUE tracepoint, void *data)
 {
-	VALUE thr, ref;
+	VALUE thr, ref, tmp;
 	thread_reference_t *ptr;
 
 	thr = rb_thread_current();
@@ -202,7 +207,8 @@ process_thread_end_event(VALUE tracepoint, void *data)
 	if (ref != Qnil)
 	{
 		ptr = thread_reference_pointer(ref);
-		monitor_debug(rb_funcall(tracepoint, rb_intern("path"), 0), NUM2LONG(rb_funcall(tracepoint, rb_intern("lineno"), 0)), tracepoint, ptr, rb_intern("thread_end"));
+		tmp = rb_funcall(tracepoint, rb_intern("path"), 0);
+		monitor_debug(StringValueCStr(tmp), NUM2LONG(rb_funcall(tracepoint, rb_intern("lineno"), 0)), tracepoint, ptr, rb_intern("thread_end"));
 		thread_delete_reference(thr);
 	}
 }
@@ -220,13 +226,21 @@ monitor_enable_s(VALUE self, VALUE file)
 		rb_raise(rb_eArgError, "must be called with a block");
 	}
 
-	entryFile = file;
-	firstLineEvent = (entryFile == Qnil ? 1 : 0);
+	if (file == Qnil)
+	{
+		entryFile = NULL;
+		firstLineEvent = 1;
+	}
+	else
+	{
+		entryFile = normalize_path_new_cstr(StringValueCStr(file));
+		firstLineEvent = 0;
+	}
 
 	ref = thread_add_reference(rb_thread_current());
 	ptr = thread_reference_pointer(ref);
 	monitor_debug(
-		Qnil,
+		"",
 		0,
 		Qnil,
 		ptr,
@@ -254,6 +268,9 @@ monitor_disable_s(VALUE self)
 	rb_tracepoint_disable(tpThreadBegin);
 	rb_tracepoint_disable(tpThreadEnd);
 
+	free(entryFile);
+	entryFile = NULL;
+
 	return previous;
 }
 
@@ -301,5 +318,4 @@ void initialize_monitor(VALUE m_Readapt)
 	rb_global_variable(&tpReturn);
 	rb_global_variable(&tpThreadBegin);
 	rb_global_variable(&tpThreadEnd);
-	rb_global_variable(&entryFile);
 }

data/ext/readapt/normalize.c

@@ -14,17 +14,15 @@ checkIfWindows()
     return result == Qnil ? 0 : 1;
 }
 
-VALUE
-normalize_path(VALUE str)
+char *normalize_path_new_cstr(char *str)
 {
-    VALUE result;
     char *buffer;
     long i, len;
 
+    buffer = malloc((strlen(str) + 1) * sizeof(char));
+    strcpy(buffer, str);
     if (isWindows)
     {
-        buffer = malloc((rb_str_strlen(str) + 1) * sizeof(char));
-        strcpy(buffer, StringValueCStr(str));
         buffer[0] = toupper(buffer[0]);
         len = strlen(buffer);
         for (i = 2; i < len; i++)
@@ -34,17 +32,17 @@ normalize_path(VALUE str)
                 buffer[i] = '/';
             }
         }
-        result = rb_str_new_cstr(buffer);
-        free(buffer);
-        return result;
     }
-    return str;
+    return buffer;
 }
 
 static VALUE
 normalize_path_s(VALUE self, VALUE str)
 {
-    return normalize_path(str);
+    char *path = normalize_path_new_cstr(StringValueCStr(str));
+    VALUE result = rb_str_new_cstr(path);
+    free(path);
+    return result;
 }
 
 void initialize_normalize(VALUE m_Readapt)

data/ext/readapt/normalize.h

@@ -2,6 +2,6 @@
 #define NORMALIZE_H_
 
 void initialize_normalize(VALUE);
-VALUE normalize_path(VALUE);
+char *normalize_path_new_cstr(char *str);
 
 #endif

data/lib/readapt/version.rb

@@ -1,3 +1,3 @@
 module Readapt
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readapt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport