Rename event -> call.

Author: ioquatix

ext/io/event/profile.c

@@ -8,24 +8,24 @@
 
 #include <stdio.h>
 
-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;
+void IO_Event_Profile_Call_initialize(struct IO_Event_Profile_Call *call) {
+	call->enter_time.tv_sec = 0;
+	call->enter_time.tv_nsec = 0;
+	call->exit_time.tv_sec = 0;
+	call->exit_time.tv_nsec = 0;
 
-	event->nesting = 0;
+	call->nesting = 0;
 
-	event->event_flag = 0;
-	event->id = 0;
+	call->event_flag = 0;
+	call->id = 0;
 
-	event->path = NULL;
-	event->line = 0;
+	call->path = NULL;
+	call->line = 0;
 }
 
-void IO_Event_Profile_Call_free(struct IO_Event_Profile_Call *event) {
-	if (event->path) {
-		free((void*)event->path);
+void IO_Event_Profile_Call_free(struct IO_Event_Profile_Call *call) {
+	if (call->path) {
+		free((void*)call->path);
 	}
 }
 
@@ -41,49 +41,49 @@ static void profile_event_callback(rb_event_flag_t event_flag, VALUE data, VALUE
 	struct IO_Event_Profile *profile = (struct IO_Event_Profile*)data;
 
 	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);
+		struct IO_Event_Profile_Call *call = IO_Event_Array_push(&profile->calls);
+		IO_Event_Time_current(&call->enter_time);
 
-		event->event_flag = event_flag;
+		call->event_flag = event_flag;
 
-		event->parent = profile->current;
-		profile->current = event;
+		call->parent = profile->current;
+		profile->current = call;
 
-		event->nesting = profile->nesting;
+		call->nesting = profile->nesting;
 		profile->nesting += 1;
 
 		if (id) {
-			event->id = id;
-			event->klass = klass;
+			call->id = id;
+			call->klass = klass;
 		} else {
-			rb_frame_method_id_and_class(&event->id, &event->klass);
+			rb_frame_method_id_and_class(&call->id, &call->klass);
 		}
 
 		const char *path = rb_sourcefile();
 		if (path) {
-			event->path = strdup(path);
+			call->path = strdup(path);
 		}
-		event->line = rb_sourceline();
+		call->line = rb_sourceline();
 	} else if (event_flag_return_p(event_flag)) {
-		struct IO_Event_Profile_Call *event = profile->current;
+		struct IO_Event_Profile_Call *call = profile->current;
 
-		// Bad event sequence?
-		if (event == NULL) return;
+		// Bad call sequence?
+		if (call == NULL) return;
 
-		IO_Event_Time_current(&event->exit_time);
+		IO_Event_Time_current(&call->exit_time);
 
-		profile->current = event->parent;
+		profile->current = call->parent;
 		profile->nesting -= 1;
 	}
 }
 
 void IO_Event_Profile_initialize(struct IO_Event_Profile *profile, VALUE fiber) {
 	profile->fiber = fiber;
 
-	profile->events.element_initialize = (void (*)(void*))IO_Event_Profile_Call_initialize;
-	profile->events.element_free = (void (*)(void*))IO_Event_Profile_Call_free;
+	profile->calls.element_initialize = (void (*)(void*))IO_Event_Profile_Call_initialize;
+	profile->calls.element_free = (void (*)(void*))IO_Event_Profile_Call_free;
 
-	IO_Event_Array_initialize(&profile->events, 0, sizeof(struct IO_Event_Profile_Call));
+	IO_Event_Array_initialize(&profile->calls, 0, sizeof(struct IO_Event_Profile_Call));
 }
 
 void IO_Event_Profile_start(struct IO_Event_Profile *profile) {
@@ -104,7 +104,7 @@ void IO_Event_Profile_stop(struct IO_Event_Profile *profile) {
 }
 
 void IO_Event_Profile_free(struct IO_Event_Profile *profile) {
-	IO_Event_Array_free(&profile->events);
+	IO_Event_Array_free(&profile->calls);
 }
 
 static const float IO_EVENT_PROFILE_PRINT_MINIMUM_PROPORTION = 0.01;
@@ -115,28 +115,28 @@ 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_Call *event = profile->events.base[i];
+	for (size_t i = 0; i < profile->calls.limit; i += 1) {
+		struct IO_Event_Profile_Call *call = profile->calls.base[i];
 
 		struct timespec duration = {};
 
-		IO_Event_Time_elapsed(&event->enter_time, &event->exit_time, &duration);
+		IO_Event_Time_elapsed(&call->enter_time, &call->exit_time, &duration);
 
-		// Skip events that are too short to be meaningful:
+		// Skip calls 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) {
+		for (size_t i = 0; i < call->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));
+		const char *name = rb_id2name(call->id);
+		fprintf(stream, "\t%s:%d in '%s#%s' (" IO_EVENT_TIME_PRINTF_TIMESPEC "s)\n", call->path, call->line, RSTRING_PTR(rb_inspect(call->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);
+		fprintf(stream, "Skipped %zu calls that were too short to be meaningful.\n", skipped);
 	}
 }

ext/io/event/profile.h

@@ -35,7 +35,7 @@ struct IO_Event_Profile {
 	// The current call frame:
 	struct IO_Event_Profile_Call *current;
 
-	struct IO_Event_Array events;
+	struct IO_Event_Array calls;
 };
 
 void IO_Event_Profile_initialize(struct IO_Event_Profile *profile, VALUE fiber);