notify: Windows

Author: enghitalo

vlib/os/notify/notify_test.c.v

@@ -5,59 +5,51 @@ import os.notify
 
 // make a pipe and return the (read, write) file descriptors
 fn make_pipe() !(int, int) {
-	$if linux || macos {
-		pipefd := [2]int{}
-		if C.pipe(&pipefd[0]) != 0 {
-			return error('error ${C.errno}: ' + os.posix_get_error_msg(C.errno))
-		}
-		return pipefd[0], pipefd[1]
+	pipefd := [2]int{}
+	if C.pipe(&pipefd[0]) != 0 {
+		return error('error ${C.errno}: ' + os.posix_get_error_msg(C.errno))
 	}
-	return -1, -1
+	return pipefd[0], pipefd[1]
 }
 
 fn test_level_trigger() {
-	// currently only linux and macos are supported
-	$if linux || macos {
-		mut notifier := notify.new()!
-		reader, writer := make_pipe()!
-		defer {
-			os.fd_close(reader)
-			os.fd_close(writer)
-			notifier.close() or {}
-		}
-		notifier.add(reader, .read)!
+	mut notifier := notify.new()!
+	reader, writer := make_pipe()!
+	defer {
+		os.fd_close(reader)
+		os.fd_close(writer)
+		notifier.close() or {}
+	}
+	notifier.add(reader, .read)!
 
-		os.fd_write(writer, 'foobar')
-		mut n := &notifier
-		check_read_event(mut n, reader, 'foo')
-		check_read_event(mut n, reader, 'bar')
+	os.fd_write(writer, 'foobar')
+	mut n := &notifier
+	check_read_event(mut n, reader, 'foo')
+	check_read_event(mut n, reader, 'bar')
 
-		assert notifier.wait(0).len == 0
-	}
+	assert notifier.wait(0).len == 0
 }
 
 fn test_edge_trigger() {
-	// currently only linux and macos are supported
-	$if linux || macos {
-		mut notifier := notify.new()!
-		reader, writer := make_pipe()!
-		defer {
-			os.fd_close(reader)
-			os.fd_close(writer)
-			notifier.close() or {}
-		}
-		notifier.add(reader, .read, .edge_trigger)!
+	mut notifier := notify.new()!
+	reader, writer := make_pipe()!
+	defer {
+		os.fd_close(reader)
+		os.fd_close(writer)
+		notifier.close() or {}
+	}
+	notifier.add(reader, .read, .edge_trigger)!
 
-		mut n := &notifier
+	mut n := &notifier
 
-		os.fd_write(writer, 'foobar')
-		check_read_event(mut n, reader, 'foo')
+	os.fd_write(writer, 'foobar')
+	check_read_event(mut n, reader, 'foo')
 
-		$if linux {
-			assert notifier.wait(0).len == 0
-		}
-		$if macos {
-			/*
+	$if linux {
+		assert notifier.wait(0).len == 0
+	}
+	$if macos {
+		/*
 			In the kqueue of macos, EV_CLEAR flag represents a clear event,
 			which is mainly used for pipeline and socket class events. When this flag is set,
 			kqueue will trigger the corresponding event when the data is readable or writable,
@@ -72,44 +64,40 @@ fn test_edge_trigger() {
 			the next kqueue event notification may still be triggered
 			*/
 
-			// notifier.wait(0).len == 1 or 0
-		}
-
-		os.fd_write(writer, 'baz')
-		// we do not get an event because there is still data
-		// to be read
-		// assert notifier.wait(0).len == 0
-		// TODO: investigage why the above assert suddenly started failing on the latest Ubuntu kernel update:
-		// 5.11.0-37-generic #41~20.04.2-Ubuntu SMP Fri Sep 24 09:06:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
+		// notifier.wait(0).len == 1 or 0
 	}
+
+	os.fd_write(writer, 'baz')
+	// we do not get an event because there is still data
+	// to be read
+	// assert notifier.wait(0).len == 0
+	// TODO: investigage why the above assert suddenly started failing on the latest Ubuntu kernel update:
+	// 5.11.0-37-generic #41~20.04.2-Ubuntu SMP Fri Sep 24 09:06:38 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
 }
 
 fn test_one_shot() {
-	$if linux || macos {
-		mut notifier := notify.new()!
-		reader, writer := make_pipe()!
-		defer {
-			os.fd_close(reader)
-			os.fd_close(writer)
-			notifier.close() or {}
-		}
-		notifier.add(reader, .read, .one_shot)!
+	mut notifier := notify.new()!
+	reader, writer := make_pipe()!
+	defer {
+		os.fd_close(reader)
+		os.fd_close(writer)
+		notifier.close() or {}
+	}
+	notifier.add(reader, .read, .one_shot)!
 
-		mut n := &notifier
+	mut n := &notifier
 
-		os.fd_write(writer, 'foobar')
-		check_read_event(mut n, reader, 'foo')
-		os.fd_write(writer, 'baz')
+	os.fd_write(writer, 'foobar')
+	check_read_event(mut n, reader, 'foo')
+	os.fd_write(writer, 'baz')
 
-		assert notifier.wait(0).len == 0
+	assert notifier.wait(0).len == 0
 
-		// rearm
-		notifier.modify(reader, .read)!
-		check_read_event(mut n, reader, 'barbaz')
-	}
+	// rearm
+	notifier.modify(reader, .read)!
+	check_read_event(mut n, reader, 'barbaz')
 }
 
-// Kqueue does not support 'hangup' event type.
 fn test_hangup() {
 	$if linux {
 		mut notifier := notify.new()!
@@ -133,46 +121,42 @@ fn test_hangup() {
 }
 
 fn test_write() {
-	$if linux || macos {
-		mut notifier := notify.new()!
-		reader, writer := make_pipe()!
-		defer {
-			os.fd_close(reader)
-			os.fd_close(writer)
-			notifier.close() or {}
-		}
+	mut notifier := notify.new()!
+	reader, writer := make_pipe()!
+	defer {
+		os.fd_close(reader)
+		os.fd_close(writer)
+		notifier.close() or {}
+	}
 
-		notifier.add(reader, .write)!
-		assert notifier.wait(0).len == 0
+	notifier.add(reader, .write)!
+	assert notifier.wait(0).len == 0
 
-		notifier.add(writer, .write)!
-		events := notifier.wait(0)
-		assert events.len == 1
-		assert events[0].fd == writer
-		assert events[0].kind.has(.write)
-	}
+	notifier.add(writer, .write)!
+	events := notifier.wait(0)
+	assert events.len == 1
+	assert events[0].fd == writer
+	assert events[0].kind.has(.write)
 }
 
 fn test_remove() {
-	$if linux || macos {
-		mut notifier := notify.new()!
-		reader, writer := make_pipe()!
-		defer {
-			os.fd_close(reader)
-			os.fd_close(writer)
-			notifier.close() or {}
-		}
+	mut notifier := notify.new()!
+	reader, writer := make_pipe()!
+	defer {
+		os.fd_close(reader)
+		os.fd_close(writer)
+		notifier.close() or {}
+	}
 
-		// level triggered - will keep getting events while
-		// there is data to read
-		notifier.add(reader, .read)!
-		os.fd_write(writer, 'foobar')
-		assert notifier.wait(0).len == 1
-		assert notifier.wait(0).len == 1
+	// level triggered - will keep getting events while
+	// there is data to read
+	notifier.add(reader, .read)!
+	os.fd_write(writer, 'foobar')
+	assert notifier.wait(0).len == 1
+	assert notifier.wait(0).len == 1
 
-		notifier.remove(reader)!
-		assert notifier.wait(0).len == 0
-	}
+	notifier.remove(reader)!
+	assert notifier.wait(0).len == 0
 }
 
 fn check_read_event(mut notifier notify.FdNotifier, reader_fd int, expected string) {