io-event 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac3ad1ac294041242bb2f44d9c34bf6871f36b7ae01faaf49b83989b75058e84
-  data.tar.gz: e622ec2203010b41c260a763c97cac8025bf86d1d5b04b0ff916f3cf7d7eb467
+  metadata.gz: 9b0f569ddbe799cd62297cbe404f9799a5354cdb8a29bf0e75c2ae566bedc1fa
+  data.tar.gz: dc7c358d32584e3f83bf13e4457e556606f38a8084408273b01e9cb5763284e5
 SHA512:
-  metadata.gz: dd0ba1be23b1c113af78c07d7d8aab84759d984ba1a0569cdfe31c427e34de7d97a8a7fc5598dd4cfe0ec650709c24bf764c1d5c385b8de34cf70157195dc4e7
-  data.tar.gz: 91936ec8d38c517cfdd6a22a72199067f49933811522eb71e4d23df49046725c1708f23481fb5f9430852143093594793f3635fd7a58624e539d97555eafb18a
+  metadata.gz: 358ccfbdcf25cd12731e6f98583db917207411db261d69c5ed2adf3c3c4f84fcb6e572d7029365bb82c501b00c68d9af3726cbb74d3983e44b189d7d362eb147
+  data.tar.gz: 63a5a659138caebfcd0fa8ebc08235127d556dc4c16d0e73f70613b360e702bc73f458156c40f79afdb2f93378e40859fd10c7be0df3e4cc7a355d29b8501325

data/ext/io/event/profile.c

@@ -8,9 +8,12 @@
 
 #include <stdio.h>
 
-void IO_Event_Profile_Event_initialize(struct IO_Event_Profile_Event *event) {
-	event->time.tv_sec = 0;
-	event->time.tv_nsec = 0;
+void IO_Event_Profile_Call_initialize(struct IO_Event_Profile_Call *event) {
+	event->enter_time.tv_sec = 0;
+	event->enter_time.tv_nsec = 0;
+	event->exit_time.tv_sec = 0;
+	event->exit_time.tv_nsec = 0;
+	
 	event->nesting = 0;
 	
 	event->event_flag = 0;
@@ -20,27 +23,12 @@ void IO_Event_Profile_Event_initialize(struct IO_Event_Profile_Event *event) {
 	event->line = 0;
 }
 
-void IO_Event_Profile_Event_free(struct IO_Event_Profile_Event *event) {
+void IO_Event_Profile_Call_free(struct IO_Event_Profile_Call *event) {
 	if (event->path) {
 		free((void*)event->path);
 	}
 }
 
-static const char *event_flag_name(rb_event_flag_t event_flag) {
-	switch (event_flag) {
-		case RUBY_EVENT_LINE:
-			return "line";
-		case RUBY_EVENT_CALL:
-		case RUBY_EVENT_C_CALL:
-			return "call";
-		case RUBY_EVENT_RETURN:
-		case RUBY_EVENT_C_RETURN:
-			return "return";
-		default:
-			return "unknown";
-	}
-}
-
 int event_flag_call_p(rb_event_flag_t event_flags) {
 	return event_flags & (RUBY_EVENT_CALL | RUBY_EVENT_C_CALL);
 }
@@ -51,13 +39,13 @@ int event_flag_return_p(rb_event_flag_t event_flags) {
 
 static void profile_event_callback(rb_event_flag_t event_flag, VALUE data, VALUE self, ID id, VALUE klass) {
 	struct IO_Event_Profile *profile = (struct IO_Event_Profile*)data;
-	struct IO_Event_Profile_Event *event = IO_Event_Array_push(&profile->events);
-	
-	IO_Event_Time_current(&event->time);
-	
-	event->event_flag = event_flag;
 	
 	if (event_flag_call_p(event_flag)) {
+		struct IO_Event_Profile_Call *event = IO_Event_Array_push(&profile->events);
+		IO_Event_Time_current(&event->enter_time);
+	
+		event->event_flag = event_flag;
+		
 		event->parent = profile->current;
 		profile->current = event;
 		
@@ -77,25 +65,25 @@ static void profile_event_callback(rb_event_flag_t event_flag, VALUE data, VALUE
 		}
 		event->line = rb_sourceline();
 	} else if (event_flag_return_p(event_flag)) {
-		// Set up the call/return pair:
-		profile->current->pair = event;
-		event->pair = profile->current;
+		struct IO_Event_Profile_Call *event = profile->current;
 		
-		profile->current = profile->current->parent;
-		event->parent = profile->current;
+		// Bad event sequence?
+		if (event == NULL) return;
 		
+		IO_Event_Time_current(&event->exit_time);
+		
+		profile->current = event->parent;
 		profile->nesting -= 1;
-		event->nesting = profile->nesting;
 	}
 }
 
 void IO_Event_Profile_initialize(struct IO_Event_Profile *profile, VALUE fiber) {
 	profile->fiber = fiber;
 	
-	profile->events.element_initialize = (void (*)(void*))IO_Event_Profile_Event_initialize;
-	profile->events.element_free = (void (*)(void*))IO_Event_Profile_Event_free;
+	profile->events.element_initialize = (void (*)(void*))IO_Event_Profile_Call_initialize;
+	profile->events.element_free = (void (*)(void*))IO_Event_Profile_Call_free;
 	
-	IO_Event_Array_initialize(&profile->events, 0, sizeof(struct IO_Event_Profile_Event));
+	IO_Event_Array_initialize(&profile->events, 0, sizeof(struct IO_Event_Profile_Call));
 }
 
 void IO_Event_Profile_start(struct IO_Event_Profile *profile) {
@@ -128,27 +116,27 @@ void IO_Event_Profile_print(FILE *restrict stream, struct IO_Event_Profile *prof
 	size_t skipped = 0;
 	
 	for (size_t i = 0; i < profile->events.limit; i += 1) {
-		struct IO_Event_Profile_Event *event = profile->events.base[i];
+		struct IO_Event_Profile_Call *event = profile->events.base[i];
+		
+		struct timespec duration = {};
 		
-		if (event_flag_call_p(event->event_flag)) {
-			struct timespec duration = {};
-			
-			if (event->pair) {
-				IO_Event_Time_elapsed(&event->time, &event->pair->time, &duration);
-				
-				// Skip events that are too short to be meaningful:
-				if (IO_Event_Time_proportion(&duration, &total_duration) < IO_EVENT_PROFILE_PRINT_MINIMUM_PROPORTION) {
-					skipped += 1;
-					continue;
-				}
-			}
-			
-			for (size_t i = 0; i < event->nesting; i += 1) {
-				fputc('\t', stream);
-			}
-			
-			const char *name = rb_id2name(event->id);
-			fprintf(stream, "\t%s:%d in '%s#%s' (" IO_EVENT_TIME_PRINTF_TIMESPEC "s)\n", event->path, event->line, RSTRING_PTR(rb_inspect(event->klass)), name, IO_EVENT_TIME_PRINTF_TIMESPEC_ARGUMENTS(duration));
+		IO_Event_Time_elapsed(&event->enter_time, &event->exit_time, &duration);
+		
+		// Skip events that are too short to be meaningful:
+		if (IO_Event_Time_proportion(&duration, &total_duration) < IO_EVENT_PROFILE_PRINT_MINIMUM_PROPORTION) {
+			skipped += 1;
+			continue;
 		}
+		
+		for (size_t i = 0; i < event->nesting; i += 1) {
+			fputc('\t', stream);
+		}
+		
+		const char *name = rb_id2name(event->id);
+		fprintf(stream, "\t%s:%d in '%s#%s' (" IO_EVENT_TIME_PRINTF_TIMESPEC "s)\n", event->path, event->line, RSTRING_PTR(rb_inspect(event->klass)), name, IO_EVENT_TIME_PRINTF_TIMESPEC_ARGUMENTS(duration));
+	}
+	
+	if (skipped > 0) {
+		fprintf(stream, "Skipped %zu events that were too short to be meaningful.\n", skipped);
 	}
 }

data/ext/io/event/profile.h

@@ -7,8 +7,10 @@
 #include "array.h"
 #include "time.h"
 
-struct IO_Event_Profile_Event {
-	struct timespec time;
+struct IO_Event_Profile_Call {
+	struct timespec enter_time;
+	struct timespec exit_time;
+	
 	size_t nesting;
 	
 	rb_event_flag_t event_flag;
@@ -18,8 +20,7 @@ struct IO_Event_Profile_Event {
 	const char *path;
 	int line;
 	
-	struct IO_Event_Profile_Event *parent;
-	struct IO_Event_Profile_Event *pair;
+	struct IO_Event_Profile_Call *parent;
 };
 
 struct IO_Event_Profile {
@@ -32,7 +33,7 @@ struct IO_Event_Profile {
 	size_t nesting;
 	
 	// The current call frame:
-	struct IO_Event_Profile_Event *current;
+	struct IO_Event_Profile_Call *current;
 	
 	struct IO_Event_Array events;
 };

data/ext/io/event/selector/kqueue.c

@@ -975,7 +975,7 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 	// Non-comprehensive testing shows this gives a 1.5x speedup.
 	
 	// First do the syscall with no timeout to get any immediately available events:
-	if (DEBUG) fprintf(stderr, "\r\nselect_internal_with_gvl timeout=" IO_EVENT_PRINTF_TIMESPEC "\r\n", IO_EVENT_PRINTF_TIMESPEC_ARGUMENTS(arguments.storage));
+	if (DEBUG) fprintf(stderr, "\r\nselect_internal_with_gvl timeout=" IO_EVENT_TIME_PRINTF_TIMESPEC "\r\n", IO_EVENT_TIME_PRINTF_TIMESPEC_ARGUMENTS(arguments.storage));
 	select_internal_with_gvl(&arguments);
 	if (DEBUG) fprintf(stderr, "\r\nselect_internal_with_gvl done\r\n");
 	
@@ -993,7 +993,7 @@ VALUE IO_Event_Selector_KQueue_select(VALUE self, VALUE duration) {
 			struct timespec start_time;
 			IO_Event_Time_current(&start_time);
 			
-			if (DEBUG) fprintf(stderr, "IO_Event_Selector_KQueue_select timeout=" IO_EVENT_PRINTF_TIMESPEC "\n", IO_EVENT_PRINTF_TIMESPEC_ARGUMENTS(arguments.storage));
+			if (DEBUG) fprintf(stderr, "IO_Event_Selector_KQueue_select timeout=" IO_EVENT_TIME_PRINTF_TIMESPEC "\n", IO_EVENT_TIME_PRINTF_TIMESPEC_ARGUMENTS(arguments.storage));
 			select_internal_without_gvl(&arguments);
 			
 			struct timespec end_time;

data/lib/io/event/version.rb

@@ -7,6 +7,6 @@
 class IO
 	# @namespace
 	module Event
-		VERSION = "1.8.0"
+		VERSION = "1.8.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-event
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Samuel Williams