2009-02-10 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / io-layer / wapi-private.h

diff --git a/mono/io-layer/wapi-private.h b/mono/io-layer/wapi-private.h
index 05b48411160c38e56f28b869ab33e92e89ba1e47..830405684b4f040fdff18dc7085f66a61bd3b7e5 100644 (file)
--- a/mono/io-layer/wapi-private.h
+++ b/mono/io-layer/wapi-private.h
@@ -4,7 +4,7 @@
  * Author:
  *     Dick Porter (dick@ximian.com)
  *
- * (C) 2002 Ximian, Inc.
+ * (C) 2002-2006 Novell, Inc.
  */
 
 #ifndef _WAPI_PRIVATE_H_
@@ -12,6 +12,7 @@
 
 #include <config.h>
 #include <glib.h>
+#include <sys/stat.h>
 
 #include <mono/io-layer/handles.h>
 #include <mono/io-layer/io.h>
@@ -24,7 +25,7 @@
 /* Increment this whenever an incompatible change is made to the
  * shared handle structure.
  */
-#define _WAPI_HANDLE_VERSION 4
+#define _WAPI_HANDLE_VERSION 12
 
 typedef enum {
        WAPI_HANDLE_UNUSED=0,
@@ -39,21 +40,26 @@ typedef enum {
        WAPI_HANDLE_PROCESS,
        WAPI_HANDLE_PIPE,
        WAPI_HANDLE_NAMEDMUTEX,
+       WAPI_HANDLE_NAMEDSEM,
+       WAPI_HANDLE_NAMEDEVENT,
        WAPI_HANDLE_COUNT
 } WapiHandleType;
 
 extern const char *_wapi_handle_typename[];
 
-#define _WAPI_SHARED_HANDLE(type) (type == WAPI_HANDLE_THREAD || \
-                                  type == WAPI_HANDLE_PROCESS || \
-                                  type == WAPI_HANDLE_NAMEDMUTEX)
+#define _WAPI_SHARED_HANDLE(type) (type == WAPI_HANDLE_PROCESS || \
+                                  type == WAPI_HANDLE_NAMEDMUTEX || \
+                                  type == WAPI_HANDLE_NAMEDSEM || \
+                                  type == WAPI_HANDLE_NAMEDEVENT)
 
 #define _WAPI_FD_HANDLE(type) (type == WAPI_HANDLE_FILE || \
                               type == WAPI_HANDLE_CONSOLE || \
                               type == WAPI_HANDLE_SOCKET || \
                               type == WAPI_HANDLE_PIPE)
 
-#define _WAPI_SHARED_NAMESPACE(type) (type == WAPI_HANDLE_NAMEDMUTEX)
+#define _WAPI_SHARED_NAMESPACE(type) (type == WAPI_HANDLE_NAMEDMUTEX || \
+                                     type == WAPI_HANDLE_NAMEDSEM || \
+                                     type == WAPI_HANDLE_NAMEDEVENT)
 
 typedef struct 
 {
@@ -69,7 +75,7 @@ typedef enum {
 
 struct _WapiHandleOps 
 {
-       void (*close)(gpointer handle);
+       void (*close)(gpointer handle, gpointer data);
 
        /* SignalObjectAndWait */
        void (*signal)(gpointer signal);
@@ -86,12 +92,18 @@ struct _WapiHandleOps
         */
        gboolean (*is_owned)(gpointer handle);
 
-       /* Called by WaitForSingleObject, if the handle in question
-        * needs a special wait function instead of using the normal
-        * handle signal mechanism.  Returns the WaitForSingleObject
-        * return code.
+       /* Called by WaitForSingleObject and WaitForMultipleObjects,
+        * if the handle in question needs a special wait function
+        * instead of using the normal handle signal mechanism.
+        * Returns the WaitForSingleObject return code.
         */
        guint32 (*special_wait)(gpointer handle, guint32 timeout);
+
+       /* Called by WaitForSingleObject and WaitForMultipleObjects,
+        * if the handle in question needs some preprocessing before the
+        * signal wait.
+        */
+       void (*prewait)(gpointer handle);
 };
 
 #include <mono/io-layer/event-private.h>
@@ -110,8 +122,7 @@ struct _WapiHandle_shared_ref
        guint32 offset;
 };
 
-#define _WAPI_HANDLE_INITIAL_COUNT 4096
-#define _WAPI_HEADROOM 16
+#define _WAPI_HANDLE_INITIAL_COUNT 256
 
 struct _WapiHandleUnshared
 {
@@ -129,40 +140,40 @@ struct _WapiHandleUnshared
                struct _WapiHandle_mutex mutex;
                struct _WapiHandle_sem sem;
                struct _WapiHandle_socket sock;
+               struct _WapiHandle_thread thread;
                struct _WapiHandle_shared_ref shared;
        } u;
 };
 
-struct _WapiHandleSharedMetadata
-{
-       volatile guint32 offset;
-       guint32 timestamp;
-       volatile gboolean signalled;
-       volatile guint32 checking;
-};
-
 struct _WapiHandleShared
 {
        WapiHandleType type;
-       gboolean stale;
+       guint32 timestamp;
+       guint32 handle_refs;
+       volatile gboolean signalled;
        
        union
        {
-               struct _WapiHandle_thread thread;
                struct _WapiHandle_process process;
                struct _WapiHandle_namedmutex namedmutex;
+               struct _WapiHandle_namedsem namedsem;
+               struct _WapiHandle_namedevent namedevent;
        } u;
 };
 
+#define _WAPI_SHARED_SEM_NAMESPACE 0
+/*#define _WAPI_SHARED_SEM_COLLECTION 1*/
+#define _WAPI_SHARED_SEM_FILESHARE 2
+#define _WAPI_SHARED_SEM_SHARED_HANDLES 3
+#define _WAPI_SHARED_SEM_PROCESS_COUNT_LOCK 6
+#define _WAPI_SHARED_SEM_PROCESS_COUNT 7
+#define _WAPI_SHARED_SEM_COUNT 8       /* Leave some future expansion space */
+
 struct _WapiHandleSharedLayout
 {
-       guint32 namespace_check;
-       volatile guint32 signal_count;
-
-       guint32 master_timestamp;
        volatile guint32 collection_count;
+       volatile key_t sem_key;
        
-       struct _WapiHandleSharedMetadata metadata[_WAPI_HANDLE_INITIAL_COUNT];
        struct _WapiHandleShared handles[_WAPI_HANDLE_INITIAL_COUNT];
 };
 
@@ -170,8 +181,12 @@ struct _WapiHandleSharedLayout
 
 struct _WapiFileShare
 {
+#ifdef WAPI_FILE_SHARE_PLATFORM_EXTRA_DATA
+       WAPI_FILE_SHARE_PLATFORM_EXTRA_DATA
+#endif
        dev_t device;
        ino_t inode;
+       pid_t opened_by_pid;
        guint32 sharemode;
        guint32 access;
        guint32 handle_refs;
@@ -180,7 +195,6 @@ struct _WapiFileShare
 
 struct _WapiFileShareLayout
 {
-       guint32 share_check;
        guint32 hwm;
        
        struct _WapiFileShare share_info[_WAPI_FILESHARE_SIZE];