io-watch 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc26487e8282e4fb61d521424ea49b98606676fb04768fbe94e5244a44b4642
-  data.tar.gz: '08666b566a234b2e64c49ea40ff878070d12cb53398cf3b883bff22ef1542bbb'
+  metadata.gz: bff7e54dec1f3d84af735a50615748de8496fe626400b4a4abe1904893368353
+  data.tar.gz: 709deefe15939338d0f37581061479868f3a33f7893508818a4f20ec3529b6c6
 SHA512:
-  metadata.gz: 51ee161b28baae33c5745658a77a82dd01bca7b6b350a60af90a19d38c3bbb329b00c242a81ae58134ea91445101c719f6b6b2a85013bb668390f31c52d7580c
-  data.tar.gz: 9224e4d78d0509c987aba237df97babd0ed6caef5cc1f7012b4151c3ac84cd81ba2f67aa473163ce542d6325cbbf79c87ffeffb53b43de2c1142d5bc4596d618
+  metadata.gz: 90502cc34507f0687fdc141b44cf1afe67f20691e69caebfc65769408444fcbd8f68ad1a597c529f607afdb9388489a7f76bdc0413c3aed0381b2315f8748dbe
+  data.tar.gz: a69f88857c1cdd5211a75be9792b3b338fdb82f7e4442fd682eb20c479ff2e1d4be48f1d9edab547785cea67758c8d40ceb6e7c0b5f71988031f21fd7a99b35e

data/ext/Makefile

@@ -0,0 +1,31 @@
+TARGET = io-watch
+CC = cc
+CFLAGS = -Wall -Wextra
+LDFLAGS = -framework CoreServices
+SOURCES = io/watch.c io/watch/fsevent.c
+OBJECTS = $(SOURCES:.c=.o)
+PREFIX = /Users/samuel/Developer/socketry/io-watch/ext
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+# To create object files
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+# Clean Target
+clean:
+	rm -f $(TARGET) $(OBJECTS)
+
+install: $(TARGET)
+	@echo "Installing $(TARGET) to $(PREFIX)/bin"
+	mkdir -p $(PREFIX)/bin
+	install -m 755 $(TARGET) $(PREFIX)/bin
+
+uninstall:
+	@echo "Removing $(TARGET) from $(PREFIX)/bin"
+	rm -f $(PREFIX)/bin/$(TARGET)
+
+.PHONY: all clean install uninstall

data/ext/io/watch/fsevent.c

@@ -48,7 +48,7 @@ void IO_Watch_FSEvent_callback(
 	struct IO_Watch *watch = context;
 	
 	for (size_t i = 0; i < numberOfEvents; i++) {
-		if (DEBUG) fprintf(stderr, "Event: %s\n", eventPaths[i]);
+		if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_FSEvent_callback: Event %s\n", eventPaths[i]);
 		
 		// Find the index of the path in the paths array
 		ssize_t index = IO_Watch_find_path(watch, eventPaths[i]);
@@ -57,7 +57,7 @@ void IO_Watch_FSEvent_callback(
 			// Output event data as newline-delimited JSON
 			printf("{\"index\":%zu,\"flags\":%u,\"id\":%llu}\n", index, eventFlags[i], eventIds[i]);
 		} else {
-			fprintf(stderr, "Path not found in paths array: %s\n", eventPaths[i]);
+			fprintf(stderr, "io-watch:IO_Watch_FSEvent_callback: Path not found %s\n", eventPaths[i]);
 		}
 	}
 	

data/ext/io/watch/inotify.c

@@ -33,7 +33,7 @@ void IO_Watch_Watch_Array_initialize(struct IO_Watch_Watch_Array *array) {
 	array->capacity = 16;
 	array->watches = malloc(array->capacity * sizeof(struct IO_Watch_Watch));
 	if (!array->watches) {
-		perror("malloc");
+		perror("io-watch:IO_Watch_Watch_Array_initialize:malloc");
 		exit(EXIT_FAILURE);
 	}
 }
@@ -42,7 +42,7 @@ void IO_Watch_Watch_Array_resize(struct IO_Watch_Watch_Array *array) {
 	array->capacity *= 2;
 	array->watches = realloc(array->watches, array->capacity * sizeof(struct IO_Watch_Watch));
 	if (!array->watches) {
-		perror("realloc");
+		perror("io-watch:IO_Watch_Watch_Array_resize:realloc");
 		exit(EXIT_FAILURE);
 	}
 }
@@ -67,21 +67,30 @@ ssize_t IO_Watch_Watch_Array_find(struct IO_Watch_Watch_Array *array, int watch_
 }
 
 void IO_Watch_Watch_Array_watch(int fd, struct IO_Watch_Watch_Array *watch_array, char *path, int index) {
-	int watch_descriptor = inotify_add_watch(fd, path, IN_ALL_EVENTS);
+	int mask =
+		IN_MODIFY |      // File was modified.
+		IN_ATTRIB |      // Metadata (permissions, timestamps, etc.) changed.
+		IN_CLOSE_WRITE | // Writable file was closed.
+		IN_MOVE_SELF |   // Watched file/directory was moved.
+		IN_CREATE |      // File or directory was created within the watched directory.
+		IN_DELETE;       // File or directory was deleted within the watched directory.
+	
+	int watch_descriptor = inotify_add_watch(fd, path, mask);
+	
 	if (watch_descriptor == -1) {
-		perror("inotify_add_watch");
+		perror("io-watch:IO_Watch_Watch_Array_watch:inotify_add_watch");
 		exit(EXIT_FAILURE);
 	}
 	
 	IO_Watch_Watch_Array_add(watch_array, watch_descriptor, path, index);
 	
-	if (DEBUG) fprintf(stderr, "Added watch: %s\n", path);
+	if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_Watch_Array_watch: Added watch %s\n", path);
 }
 
 void IO_Watch_Watch_Array_scan(int fd, struct IO_Watch_Watch_Array *watch_array, const char *root, int index) {
 	DIR *dir = opendir(root);
 	if (!dir) {
-		perror("opendir");
+		perror("io-watch:IO_Watch_Watch_Array_scan:opendir");
 		return;
 	}
 	
@@ -94,13 +103,13 @@ void IO_Watch_Watch_Array_scan(int fd, struct IO_Watch_Watch_Array *watch_array,
 		size_t size = strlen(root) + 1 + strlen(entry->d_name) + 1;
 		char *path = malloc(size);
 		snprintf(path, size, "%s/%s", root, entry->d_name);
-
+		
 		struct stat statbuf;
 		if (stat(path, &statbuf) == -1) {
-			perror("stat");
+			perror("io-watch:IO_Watch_Watch_Array_scan:stat");
 			continue;
 		}
-
+		
 		if (S_ISDIR(statbuf.st_mode)) {
 			IO_Watch_Watch_Array_watch(fd, watch_array, path, index);
 			IO_Watch_Watch_Array_scan(fd, watch_array, path, index);
@@ -108,7 +117,7 @@ void IO_Watch_Watch_Array_scan(int fd, struct IO_Watch_Watch_Array *watch_array,
 			free(path);
 		}
 	}
-
+	
 	closedir(dir);
 }
 
@@ -116,7 +125,7 @@ void IO_Watch_Watch_Array_add_subdirectory(int fd, struct IO_Watch_Watch_Array *
 	size_t size = strlen(watch.path) + 1 + strlen(name) + 1;
 	char *path = malloc(size);
 	snprintf(path, size, "%s/%s", watch.path, name);
-
+	
 	IO_Watch_Watch_Array_watch(fd, watch_array, path, watch.index);
 	IO_Watch_Watch_Array_scan(fd, watch_array, path, watch.index);
 }
@@ -124,7 +133,7 @@ void IO_Watch_Watch_Array_add_subdirectory(int fd, struct IO_Watch_Watch_Array *
 void IO_Watch_Watch_Array_remove(int fd, struct IO_Watch_Watch_Array *watch_array, size_t index) {
 	struct IO_Watch_Watch watch = watch_array->watches[index];
 	
-	if (DEBUG) fprintf(stderr, "Removing watch: %s\n", watch.path);
+	if (DEBUG) fprintf(stderr, "io-watch:IO_Watch_Watch_Array_add_subdirectory: Removing watch %s\n", watch.path);
 	
 	inotify_rm_watch(fd, watch.watch_descriptor);
 	free(watch.path);
@@ -138,7 +147,7 @@ void IO_Watch_Watch_Array_remove(int fd, struct IO_Watch_Watch_Array *watch_arra
 
 static
 void IO_Watch_INotify_print_event(struct inotify_event *event) {
-	fprintf(stderr, "Event: wd=%d", event->wd);
+	fprintf(stderr, "Event wd=%d", event->wd);
 	
 	uint32_t mask = event->mask;
 	if (mask & IN_ACCESS) fprintf(stderr, " ACCESS");
@@ -170,41 +179,54 @@ void IO_Watch_INotify_print_event(struct inotify_event *event) {
 void IO_Watch_run(struct IO_Watch *watch) {
 	int fd = inotify_init1(IN_NONBLOCK);
 	if (fd == -1) {
-		perror("inotify_init1");
+		perror("io-watch:IO_Watch_run:inotify_init1");
 		exit(EXIT_FAILURE);
 	}
-
+	
 	struct IO_Watch_Watch_Array watch_array;
 	IO_Watch_Watch_Array_initialize(&watch_array);
-
+	
 	for (size_t i = 0; i < watch->size; i++) {
 		char *path = strdup(watch->paths[i]);
 		
 		IO_Watch_Watch_Array_watch(fd, &watch_array, path, i);
 		IO_Watch_Watch_Array_scan(fd, &watch_array, path, i);
 	}
-
+	
 	printf("{\"status\":\"started\"}\n");
 	fflush(stdout);
-
+	
 	char buffer[BUFFER_SIZE] __attribute__ ((aligned(8)));
 	
 	while (1) {
 		ssize_t result = read(fd, buffer, BUFFER_SIZE);
 		if (result == -1 && errno != EAGAIN) {
-			perror("read");
+			perror("(io-watch:IO_Watch_run:read)");
 			exit(EXIT_FAILURE);
 		}
-
+		
 		for (ssize_t offset = 0; offset < result;) {
 			struct inotify_event *event = (struct inotify_event *) &buffer[offset];
-			if (DEBUG) IO_Watch_INotify_print_event(event);
+			if (DEBUG) {
+				fprintf(stderr, "io-watch:IO_Watch_run: ");
+				IO_Watch_INotify_print_event(event);
+			}
+			
+			if (event->wd == -1) {
+				if (event->mask & IN_Q_OVERFLOW) {
+					fprintf(stderr, "io-watch:IO_Watch_run: Queue overflow\n");
+				} else {
+					fprintf(stderr, "io-watch:IO_Watch_run: Unknown error ");
+					IO_Watch_INotify_print_event(event);
+				}
+				break;
+			}
 			
 			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 a new directory is created, add a watch for it
 				if (event->mask & IN_CREATE && event->mask & IN_ISDIR) {
 					IO_Watch_Watch_Array_add_subdirectory(fd, &watch_array, watch_array.watches[index], event->name);
@@ -212,9 +234,9 @@ void IO_Watch_run(struct IO_Watch *watch) {
 					IO_Watch_Watch_Array_remove(fd, &watch_array, index);
 				}
 			} else {
-				fprintf(stderr, "Watch descriptor not found: %d\n", event->wd);
+				fprintf(stderr, "io-watch:IO_Watch_run: Watch descriptor %d not found!\n", event->wd);
 			}
-
+			
 			offset += sizeof(struct inotify_event) + event->len;
 		}
 		fflush(stdout);

data/ext/io/watch.c

@@ -27,10 +27,10 @@ int main(int argc, char **argv) {
 	for (size_t i = 0; i < watch.size; i++) {
 		char *real_path = realpath(watch.paths[i], NULL);
 		if (real_path == NULL) {
-			fprintf(stderr, "Error: realpath failed for %s\n", watch.paths[i]);
+			fprintf(stderr, "io-watch:main: Realpath failed for %s\n", watch.paths[i]);
 			return 1;
 		} else {
-			if (DEBUG) fprintf(stderr, "Watching: %s\n", real_path);
+			if (DEBUG) fprintf(stderr, "io-watch:main: Watching %s\n", real_path);
 			watch.paths[i] = real_path;
 		}
 	}

data/lib/io/watch/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Watch
-		VERSION = '0.5.0'
+		VERSION = '0.6.0'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-watch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -48,9 +48,14 @@ extensions:
 extra_rdoc_files: []
 files:
 - bin/io-watch
+- ext/Makefile
+- ext/bin/io-watch
 - ext/configure
+- ext/io-watch
 - ext/io/watch.c
+- ext/io/watch.o
 - ext/io/watch/fsevent.c
+- ext/io/watch/fsevent.o
 - ext/io/watch/inotify.c
 - ext/io/watch/watch.h
 - lib/io/watch.rb