io-watch 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b3d57b500111de6639098f96580da6ddfc5029f77fc0daf97159e54415ea7c5
-  data.tar.gz: 0ee6cfbdb782214fc141b713f7396448e92ae438244939ed48b9681a6e620f7f
+  metadata.gz: 0d6ca67070f5fe227f2e06b5c5fa8bc2498a640aa88fb7e21a21da0bf5a09434
+  data.tar.gz: 8973b98b3412da62ddcca9850ab04c3c69b1e00ab15e35e2bddf275a99f20823
 SHA512:
-  metadata.gz: 3e4873bbd69789206c2704fe3e20914c7955c79d2310513adcf8dd9371c6773bf9d0a729b19b1de4a18fe852631435184559d98600d7de5b2ecd81a5a633075a
-  data.tar.gz: cbc9fdaedb8f1383e36e845cd07341e2427e706c205a94da35b355eb87ae049f9d2a256d30beb3a4616f35fbcf10f66e5022e0653849a3762a01376a7937f003
+  metadata.gz: db38f21e23045fb052299ee4974ee4cecd283ea406f32dd5a5e453ef7125c8d0a9086589ed6d0b8c0977311071367b2ba2429f93f71127f7e335b8f451208de4
+  data.tar.gz: c6c6af9a7975ea6912b582bddc8b52ac0ef480de0a30c83d70c1781036e46eb93d97b87c58b0e12a558d29bff57955c8a75db483d97b427775b2da13ad557481

data/ext/io/watch/inotify.c

@@ -9,6 +9,8 @@
 #include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <time.h>
+#include <poll.h>
 
 enum {
 	DEBUG = 0,
@@ -18,11 +20,16 @@ struct IO_Watch_Watch {
 	int watch_descriptor;
 	char *path;
 	int index;
+	
+	int modified;
 };
 
 struct IO_Watch_Watch_Array {
 	size_t size;
 	size_t capacity;
+	
+	size_t pending;
+	
 	struct IO_Watch_Watch *watches;
 };
 
@@ -31,6 +38,7 @@ struct IO_Watch_Watch_Array {
 void IO_Watch_Watch_Array_initialize(struct IO_Watch_Watch_Array *array) {
 	array->size = 0;
 	array->capacity = 16;
+	array->pending = 0;
 	array->watches = malloc(array->capacity * sizeof(struct IO_Watch_Watch));
 	if (!array->watches) {
 		perror("io-watch:IO_Watch_Watch_Array_initialize:malloc");
@@ -176,6 +184,46 @@ void IO_Watch_INotify_print_event(struct inotify_event *event) {
 	fprintf(stderr, "\n");
 }
 
+static size_t IO_Watch_INotify_flush_events(struct IO_Watch_Watch_Array watch_array) {
+	size_t count = 0;
+	
+	if (watch_array.pending == 0) {
+		return 0;
+	}
+	
+	for (size_t i = 0; i < watch_array.size; i++) {
+		int modified = watch_array.watches[i].modified;
+		if (modified) {
+			count++;
+			
+			printf("{\"index\":%d,\"mask\":%u}\n", watch_array.watches[i].index, modified);
+			watch_array.watches[i].modified = 0;
+		}
+	}
+	
+	watch_array.pending = 0;
+	
+	fflush(stdout);
+	
+	if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_INotify_flush_events: Flushed %zu events\n", count);
+	
+	return count;
+}
+
+static float IO_Watch_handle_timeout(float latency, struct timespec *start_time) {
+	if (start_time) {
+		struct timespec current_time;
+		clock_gettime(CLOCK_MONOTONIC, &current_time);
+		
+		float delta = current_time.tv_sec - start_time->tv_sec;
+		delta += (current_time.tv_nsec - start_time->tv_nsec) / 1e9;
+		
+		return latency - delta;
+	} else {
+		return 0.0;
+	}
+}
+
 void IO_Watch_run(struct IO_Watch *watch) {
 	int fd = inotify_init1(IN_NONBLOCK);
 	if (fd == -1) {
@@ -193,16 +241,60 @@ void IO_Watch_run(struct IO_Watch *watch) {
 		IO_Watch_Watch_Array_scan(fd, &watch_array, path, i);
 	}
 	
+	float latency = watch->latency;
+	
+	// If start_time is non-null, it means we are now coallescing events, up to the specified latency:
+	struct timespec start_time_buffer, *start_time = NULL;
+	
 	printf("{\"status\":\"started\"}\n");
 	fflush(stdout);
 	
 	char buffer[BUFFER_SIZE] __attribute__ ((aligned(8)));
 	
 	while (1) {
+		// Check for any events:
 		ssize_t result = read(fd, buffer, BUFFER_SIZE);
-		if (result == -1 && errno != EAGAIN) {
-			perror("(io-watch:IO_Watch_run:read)");
-			exit(EXIT_FAILURE);
+		
+		// Calculate the timeout, if any:
+		float timeout = IO_Watch_handle_timeout(latency, start_time);
+		
+		// We need to check if the timeout has expired:
+		if (timeout < 0.0) {
+			if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_run: Timeout expired\n");
+			
+			start_time = NULL;
+			// Flush any pending events:
+			IO_Watch_INotify_flush_events(watch_array);
+		}
+		
+		// If no events are available, we have to wait for the timeout:
+		if (result == -1) {
+			if (errno != EAGAIN && errno != EWOULDBLOCK) {
+				perror("(io-watch:IO_Watch_run:read)");
+				exit(EXIT_FAILURE);
+			}
+			
+			if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_run: No events available, waiting for %0.4f seconds\n", timeout);
+			
+			// Wait until the file descriptor becomes readable:
+			struct pollfd poll_fd = {fd, POLLIN, 0};
+			int poll_timeout = start_time ? (int) (timeout * 1e3) : -1;
+			
+			// If we have a timeout of 0.0, we have to poll for at least 1 ms:
+			if (poll_timeout == 0 && timeout > 0.0) {
+				poll_timeout = 1;
+			}
+			
+			if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_run:poll: Polling for %d ms\n", poll_timeout);
+			poll(&poll_fd, 1, poll_timeout);
+			continue;
+		}
+		
+		// If we have received events, we have to set the start_time if it is not set:
+		if (!start_time) {
+			if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_run: Setting start_time\n");
+			start_time = &start_time_buffer;
+			clock_gettime(CLOCK_MONOTONIC, start_time);
 		}
 		
 		for (ssize_t offset = 0; offset < result;) {
@@ -225,7 +317,9 @@ void IO_Watch_run(struct IO_Watch *watch) {
 			ssize_t index = IO_Watch_Watch_Array_find(&watch_array, event->wd);
 			
 			if (index != -1) {
-				printf("{\"index\":%d,\"mask\":%u}\n", watch_array.watches[index].index, event->mask);
+				if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_run: Modified path %s mask=%d\n", watch_array.watches[index].path, event->mask);
+				watch_array.watches[index].modified |= event->mask;
+				watch_array.pending += 1;
 				
 				// If a new directory is created, add a watch for it
 				if (event->mask & IN_CREATE && event->mask & IN_ISDIR) {
@@ -239,9 +333,8 @@ void IO_Watch_run(struct IO_Watch *watch) {
 			
 			offset += sizeof(struct inotify_event) + event->len;
 		}
-		fflush(stdout);
 	}
-
+	
 	for (size_t i = 0; i < watch_array.size; i++) {
 		inotify_rm_watch(fd, watch_array.watches[i].watch_descriptor);
 		free(watch_array.watches[i].path);

data/lib/io/watch/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Watch
-		VERSION = '0.6.1'
+		VERSION = '0.6.2'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-watch
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-08-11 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies: []
 description:
 email: