WIP on stubbing out missing pieces to get code to compile

Author: dgrove-oss

os/linux_base.h

@@ -18,22 +18,27 @@ typedef uint32_t mach_port_t;
 
 typedef uint32_t mach_error_t;
 
+typedef uint32_t mach_vm_size_t;
+
+typedef uint32_t mach_msg_return_t;
+
+typedef uintptr_t mach_vm_address_t;
+
 typedef uint32_t dispatch_mach_msg_t;
 
 typedef uint32_t dispatch_mach_t;
 
 typedef uint32_t dispatch_mach_reason_t;
 
-typedef uint32_t mach_vm_size_t;
-
-typedef uintptr_t mach_vm_address_t;
 
 typedef struct
 {
 } mach_msg_header_t;
 
 
-typedef void (*dispatch_mach_handler_function_t)(void*);
+typedef void (*dispatch_mach_handler_function_t)(void*, dispatch_mach_reason_t,
+						 dispatch_mach_msg_t, mach_error_t);
+
 typedef void (*dispatch_mach_msg_destructor_t)(void*);
 
 /*
@@ -42,8 +47,25 @@ typedef void (*dispatch_mach_msg_destructor_t)(void*);
 
 struct kevent64_s
 {
+    uint64_t        ident;
+    int16_t         filter;
+    uint16_t        flags;
+    uint32_t        fflags;
+    int64_t         data;
+    uint64_t        udata;
+    uint64_t        ext[2];
 };
 
+typedef uint32_t voucher_activity_mode_t;
+
+struct voucher_offsets_s {
+  uint32_t vo_version;
+};
+
+
+// bogus...
+#define PAGE_SIZE 4096
+
 /*
  * Stub out misc linking and compilation attributes
  */

os/stubs.h

@@ -12,6 +12,7 @@ mach_port_t mach_task_self();
 
 void mach_vm_deallocate(mach_port_t, mach_vm_address_t, mach_vm_size_t);
 
+char* mach_error_string(mach_msg_return_t);
 #endif
 
 

src/init.c

@@ -162,7 +162,9 @@ const struct dispatch_tsd_indexes_s dispatch_tsd_indexes = {
 	.dti_qos_class_index = dispatch_priority_key,
 };
 #else // DISPATCH_USE_DIRECT_TSD
+#ifndef __LINUX_PORT_HDD__
 #error Not implemented on this platform
+#endif
 #endif // DISPATCH_USE_DIRECT_TSD
 
 // 6618342 Contact the team that owns the Instrument DTrace probe before
@@ -1157,7 +1159,10 @@ const struct dispatch_source_type_s _dispatch_source_type_vnode = {
 		.flags = EV_CLEAR|EV_UDATA_SPECIFIC,
 	},
 	.mask = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
-			NOTE_RENAME|NOTE_REVOKE
+			NOTE_RENAME
+#if HAVE_DECL_NOTE_REVOKE
+	                |NOTE_REVOKE
+#endif
 #if HAVE_DECL_NOTE_NONE
 			|NOTE_NONE
 #endif

src/io.c

@@ -387,9 +387,14 @@ dispatch_io_create_with_path(dispatch_io_type_t type, const char *path,
 		int err = 0;
 		struct stat st;
 		_dispatch_io_syscall_switch_noerr(err,
-			(path_data->oflag & O_NOFOLLOW) == O_NOFOLLOW ||
-					(path_data->oflag & O_SYMLINK) == O_SYMLINK ?
+			(path_data->oflag & O_NOFOLLOW) == O_NOFOLLOW
+#ifdef __LINUX_PORT_HDD__						  
+					?
 					lstat(path_data->path, &st) : stat(path_data->path, &st),
+#else
+					|| (path_data->oflag & O_SYMLINK) == O_SYMLINK ?
+					lstat(path_data->path, &st) : stat(path_data->path, &st),
+#endif						  
 			case 0:
 				err = _dispatch_io_validate_type(channel, st.st_mode);
 				break;
@@ -1777,17 +1782,37 @@ _dispatch_stream_cleanup_operations(dispatch_stream_t stream,
 	dispatch_operation_t op, tmp;
 	typeof(*stream->operations) *operations;
 	operations = &stream->operations[DISPATCH_IO_RANDOM];
+#ifdef __LINUX_PORT_HDD__
+	LINUX_PORT_ERROR();
+        // NOT CORRECT (doesn't support removal during iteration)
+	TAILQ_FOREACH(op, operations, operation_list) {
+		if (!channel || op->channel == channel) {
+			_dispatch_stream_complete_operation(stream, op);
+		}
+	}
+#else
 	TAILQ_FOREACH_SAFE(op, operations, operation_list, tmp) {
 		if (!channel || op->channel == channel) {
 			_dispatch_stream_complete_operation(stream, op);
 		}
 	}
+#endif
 	operations = &stream->operations[DISPATCH_IO_STREAM];
+#ifdef __LINUX_PORT_HDD__
+	LINUX_PORT_ERROR();
+        // NOT CORRECT (doesn't support removal during iteration)
+	TAILQ_FOREACH(op, operations, operation_list) {
+		if (!channel || op->channel == channel) {
+			_dispatch_stream_complete_operation(stream, op);
+		}
+	}
+#else
 	TAILQ_FOREACH_SAFE(op, operations, operation_list, tmp) {
 		if (!channel || op->channel == channel) {
 			_dispatch_stream_complete_operation(stream, op);
 		}
 	}
+#endif	
 	if (stream->source_running && !_dispatch_stream_operation_avail(stream)) {
 		dispatch_suspend(stream->source);
 		stream->source_running = false;
@@ -1799,11 +1824,21 @@ _dispatch_disk_cleanup_operations(dispatch_disk_t disk, dispatch_io_t channel)
 {
 	// On pick queue
 	dispatch_operation_t op, tmp;
+#ifdef __LINUX_PORT_HDD__
+	LINUX_PORT_ERROR();
+        // NOT CORRECT (doesn't support removal during iteration)
+	TAILQ_FOREACH(op, &disk->operations, operation_list) {
+		if (!channel || op->channel == channel) {
+			_dispatch_disk_complete_operation(disk, op);
+		}
+	}
+#else	
 	TAILQ_FOREACH_SAFE(op, &disk->operations, operation_list, tmp) {
 		if (!channel || op->channel == channel) {
 			_dispatch_disk_complete_operation(disk, op);
 		}
 	}
+#endif	
 }
 
 #pragma mark -
@@ -2064,6 +2099,9 @@ _dispatch_disk_perform(void *ctxt)
 static void
 _dispatch_operation_advise(dispatch_operation_t op, size_t chunk_size)
 {
+#ifdef __LINUX_PORT_HDD__
+  LINUX_PORT_ERROR();
+#else
 	int err;
 	struct radvisory advise;
 	// No point in issuing a read advise for the next chunk if we are already
@@ -2090,6 +2128,7 @@ _dispatch_operation_advise(dispatch_operation_t op, size_t chunk_size)
 		// TODO: set disk status on error
 		default: (void)dispatch_assume_zero(err); break;
 	);
+#endif	
 }
 
 static int