wdm 0.1.0 → 0.1.1

data/ext/wdm/entry.c

@@ -1,72 +1,72 @@
-#include "wdm.h"
-
-#include "memory.h"
-#include "entry.h"
-
-// ---------------------------------------------------------
-// Entry user data functions
-// ---------------------------------------------------------
-
-WDM_PEntryUserData
-wdm_entry_user_data_new()
-{
-    WDM_PEntryUserData user_data;
-
-    user_data = WDM_ALLOC(WDM_EntryUserData);
-
-    user_data->dir = NULL;
-    user_data->watch_childeren = FALSE;
-
-    return user_data;
-}
-
-void
-wdm_entry_user_data_free(WDM_PEntryUserData user_data)
-{
-    if ( user_data->dir != NULL ) free(user_data->dir);
-    free(user_data);
-}
-
-// ---------------------------------------------------------
-// Entry functions
-// ---------------------------------------------------------
-
-WDM_PEntry
-wdm_entry_new()
-{
-    WDM_PEntry entry;
-
-    entry = WDM_ALLOC(WDM_Entry);
-
-    entry->user_data = wdm_entry_user_data_new();
-    entry->dir_handle = INVALID_HANDLE_VALUE;
-    entry->next = NULL;
-
-    ZeroMemory(&entry->buffer, WDM_BUFFER_SIZE);
-    ZeroMemory(&entry->event_container, sizeof(OVERLAPPED));
-
-    return entry;
-}
-
-void
-wdm_entry_free(WDM_PEntry entry)
-{
-    if ( entry->dir_handle != INVALID_HANDLE_VALUE ) {
-        CancelIo(entry->dir_handle); // Stop monitoring changes
-        CloseHandle(entry->dir_handle);
-    }
-    wdm_entry_user_data_free(entry->user_data);
-    free(entry);
-}
-
-void
-wdm_entry_list_free(WDM_PEntry entry)
-{
-    WDM_PEntry tmp;
-
-    while(entry != NULL) {
-        tmp = entry;
-        entry = entry->next;
-        wdm_entry_free(tmp);
-    }
+#include "wdm.h"
+
+#include "memory.h"
+#include "entry.h"
+
+// ---------------------------------------------------------
+// Entry user data functions
+// ---------------------------------------------------------
+
+WDM_PEntryUserData
+wdm_entry_user_data_new()
+{
+    WDM_PEntryUserData user_data;
+
+    user_data = WDM_ALLOC(WDM_EntryUserData);
+
+    user_data->dir = NULL;
+    user_data->watch_childeren = FALSE;
+
+    return user_data;
+}
+
+void
+wdm_entry_user_data_free(WDM_PEntryUserData user_data)
+{
+    if ( user_data->dir != NULL ) free(user_data->dir);
+    free(user_data);
+}
+
+// ---------------------------------------------------------
+// Entry functions
+// ---------------------------------------------------------
+
+WDM_PEntry
+wdm_entry_new()
+{
+    WDM_PEntry entry;
+
+    entry = WDM_ALLOC(WDM_Entry);
+
+    entry->user_data = wdm_entry_user_data_new();
+    entry->dir_handle = INVALID_HANDLE_VALUE;
+    entry->next = NULL;
+
+    ZeroMemory(&entry->buffer, WDM_BUFFER_SIZE);
+    ZeroMemory(&entry->event_container, sizeof(OVERLAPPED));
+
+    return entry;
+}
+
+void
+wdm_entry_free(WDM_PEntry entry)
+{
+    if ( entry->dir_handle != INVALID_HANDLE_VALUE ) {
+        CancelIo(entry->dir_handle); // Stop monitoring changes
+        CloseHandle(entry->dir_handle);
+    }
+    wdm_entry_user_data_free(entry->user_data);
+    free(entry);
+}
+
+void
+wdm_entry_list_free(WDM_PEntry entry)
+{
+    WDM_PEntry tmp;
+
+    while(entry != NULL) {
+        tmp = entry;
+        entry = entry->next;
+        wdm_entry_free(tmp);
+    }
 }

data/ext/wdm/entry.h

@@ -1,47 +1,47 @@
-#include <Windows.h>
-#include <ruby.h>
-
-#ifndef WDM_ENTRY_H
-#define WDM_ENTRY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// ---------------------------------------------------------
-// Types
-// ---------------------------------------------------------
-
-typedef struct {
-    LPWSTR dir;                             // Name of directory to watch
-    VALUE callback;                         // Proc object to call when there are changes
-    BOOL watch_childeren;                   // Watch sub-directories
-    DWORD flags;                            // Flags for the type of changes to report
-} WDM_EntryUserData, *WDM_PEntryUserData;
-
-typedef struct WDM_Entry {
-    WDM_PEntryUserData user_data;           // User-supplied data
-    HANDLE dir_handle;                      // IO handle of the directory
-    BYTE buffer[WDM_BUFFER_SIZE];           // Buffer for the results
-    OVERLAPPED event_container;             // Async IO event container
-    struct WDM_Entry* next;                 // Well, this is a linked list, so this is self-explanatory :)
-} WDM_Entry, *WDM_PEntry;
-
-// ---------------------------------------------------------
-// Prototypes
-// ---------------------------------------------------------
-
-WDM_PEntryUserData wdm_entry_user_data_new();
-void wdm_entry_user_data_free(WDM_PEntryUserData);
-
-WDM_PEntry wdm_entry_new();
-void wdm_entry_free(WDM_PEntry);
-void wdm_entry_list_free(WDM_PEntry);
-
-// ---------------------------------------------------------
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
+#include <Windows.h>
+#include <ruby.h>
+
+#ifndef WDM_ENTRY_H
+#define WDM_ENTRY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// ---------------------------------------------------------
+// Types
+// ---------------------------------------------------------
+
+typedef struct {
+    LPWSTR dir;                             // Name of directory to watch
+    VALUE callback;                         // Proc object to call when there are changes
+    BOOL watch_childeren;                   // Watch sub-directories
+    DWORD flags;                            // Flags for the type of changes to report
+} WDM_EntryUserData, *WDM_PEntryUserData;
+
+typedef struct WDM_Entry {
+    WDM_PEntryUserData user_data;           // User-supplied data
+    HANDLE dir_handle;                      // IO handle of the directory
+    BYTE buffer[WDM_BUFFER_SIZE];           // Buffer for the results
+    OVERLAPPED event_container;             // Async IO event container
+    struct WDM_Entry* next;                 // Well, this is a linked list, so this is self-explanatory :)
+} WDM_Entry, *WDM_PEntry;
+
+// ---------------------------------------------------------
+// Prototypes
+// ---------------------------------------------------------
+
+WDM_PEntryUserData wdm_entry_user_data_new();
+void wdm_entry_user_data_free(WDM_PEntryUserData);
+
+WDM_PEntry wdm_entry_new();
+void wdm_entry_free(WDM_PEntry);
+void wdm_entry_list_free(WDM_PEntry);
+
+// ---------------------------------------------------------
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #endif // WDM_ENTRY_H

data/ext/wdm/extconf.rb

@@ -1,27 +1,28 @@
-require 'mkmf'
-require 'rbconfig'
-
-def generate_makefile
-  create_makefile("wdm_ext")
-end
-
-def generate_dummy_makefile
-  File.open("Makefile", "w") do |f|
-    f.puts dummy_makefile('wdm_ext').join
-  end
-end
-
-def windows?
-  RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-end
-
-if windows? and
-   have_library("kernel32") and
-   have_header("windows.h") and
-   have_header("ruby.h")    and
-   have_const('HAVE_RUBY_ENCODING_H')
-then
-   generate_makefile()
-else
-  generate_dummy_makefile() 
-end
+require 'mkmf'
+require 'rbconfig'
+
+def generate_makefile
+  create_makefile("wdm_ext")
+end
+
+def generate_dummy_makefile
+  File.open("Makefile", "w") do |f|
+    f.puts dummy_makefile('wdm_ext').join
+  end
+end
+
+def windows?
+  RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+end
+
+if windows? and
+   have_library("kernel32") and
+   have_header("windows.h") and
+   have_header("ruby.h")    and
+   have_const('HAVE_RUBY_ENCODING_H')
+then
+   have_func('rb_thread_call_without_gvl')
+   generate_makefile()
+else
+  generate_dummy_makefile() 
+end

data/ext/wdm/memory.c

@@ -1,27 +1,27 @@
-#include "wdm.h"
-
-#include "memory.h"
-
-void*
-wdm_memory_malloc (size_t size)
-{
-  void *memory = malloc(size);
-
-  if ( memory == NULL ) {
-    rb_fatal("failed to allocate memory");
-  }
-
-  return memory;
-}
-
-void*
-wdm_memory_realloc (void *ptr, size_t size)
-{
-  void *memory = realloc(ptr, size);
-
-  if ( memory == NULL ) {
-    rb_fatal("failed to re-allocate memory");
-  }
-
-  return memory;
+#include "wdm.h"
+
+#include "memory.h"
+
+void*
+wdm_memory_malloc (size_t size)
+{
+  void *memory = malloc(size);
+
+  if ( memory == NULL ) {
+    rb_fatal("failed to allocate memory");
+  }
+
+  return memory;
+}
+
+void*
+wdm_memory_realloc (void *ptr, size_t size)
+{
+  void *memory = realloc(ptr, size);
+
+  if ( memory == NULL ) {
+    rb_fatal("failed to re-allocate memory");
+  }
+
+  return memory;
 }

data/ext/wdm/memory.h

@@ -1,30 +1,30 @@
-#ifndef WDM_MEMORY_H
-#define WDM_MEMORY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif // __cplusplus
-
-// ---------------------------------------------------------
-// Prototypes
-// ---------------------------------------------------------
-
-void* wdm_memory_malloc (size_t);
-
-void* wdm_memory_realloc (void*, size_t);
-
-// ---------------------------------------------------------
-// Macros
-// ---------------------------------------------------------
-
-#define WDM_ALLOC_N(type,n) ((type*)wdm_memory_malloc((n) * sizeof(type)))
-#define WDM_ALLOC(type) ((type*)wdm_memory_malloc(sizeof(type)))
-#define WDM_REALLOC_N(var,type,n) ((var)=(type*)wdm_memory_realloc((void*)(var), (n) * sizeof(type)))
-
-// ---------------------------------------------------------
-
-#ifdef __cplusplus
-}
-#endif // __cplusplus
-
+#ifndef WDM_MEMORY_H
+#define WDM_MEMORY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// ---------------------------------------------------------
+// Prototypes
+// ---------------------------------------------------------
+
+void* wdm_memory_malloc (size_t);
+
+void* wdm_memory_realloc (void*, size_t);
+
+// ---------------------------------------------------------
+// Macros
+// ---------------------------------------------------------
+
+#define WDM_ALLOC_N(type,n) ((type*)wdm_memory_malloc((n) * sizeof(type)))
+#define WDM_ALLOC(type) ((type*)wdm_memory_malloc(sizeof(type)))
+#define WDM_REALLOC_N(var,type,n) ((var)=(type*)wdm_memory_realloc((void*)(var), (n) * sizeof(type)))
+
+// ---------------------------------------------------------
+
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #endif // WDM_MEMORY_H

data/ext/wdm/monitor.c

@@ -1,75 +1,75 @@
-#include "wdm.h"
-
-#include "memory.h"
-#include "entry.h"
-#include "queue.h"
-
-#include "monitor.h"
-
-WDM_PMonitor
-wdm_monitor_new()
-{
-    WDM_PMonitor monitor;
-
-    monitor = WDM_ALLOC(WDM_Monitor);
-
-    monitor->running = FALSE;
-
-    monitor->head = NULL;
-    monitor->monitoring_thread = INVALID_HANDLE_VALUE;
-
-    monitor->changes = wdm_queue_new();
-
-    monitor->process_event = CreateEvent(NULL, TRUE, FALSE, NULL);
-    monitor->stop_event = CreateEvent(NULL, TRUE, FALSE, NULL);
-
-    if ( ! InitializeCriticalSectionAndSpinCount(&monitor->lock,
-            0x00000400) ) // TODO: look into the best value for spinning.
-    {
-        rb_raise(eWDM_Error, "Can't create a lock for the monitor");
-    }
-
-    return monitor;
-}
-
-void
-wdm_monitor_free(WDM_PMonitor monitor)
-{
-    if ( monitor->monitoring_thread != INVALID_HANDLE_VALUE ) CloseHandle(monitor->monitoring_thread);
-
-    wdm_entry_list_free(monitor->head);
-    wdm_queue_free(monitor->changes);
-    DeleteCriticalSection(&monitor->lock);
-    CloseHandle(monitor->process_event); // TODO: Look into why this crashes the app when exiting!
-    CloseHandle(monitor->stop_event);
-
-    free(monitor);
-}
-
-void
-wdm_monitor_update_head(WDM_PMonitor monitor, WDM_PEntry new_head)
-{
-    EnterCriticalSection(&monitor->lock);
-        new_head->next = monitor->head;
-        monitor->head = new_head;
-    LeaveCriticalSection(&monitor->lock);
-}
-
-WDM_PMonitorCallbackParam
-wdm_monitor_callback_param_new(WDM_PMonitor monitor, WDM_PEntry entry)
-{
-    WDM_PMonitorCallbackParam param;
-
-    param = WDM_ALLOC(WDM_MonitorCallbackParam);
-
-    param->monitor = monitor;
-    param->entry = entry;
-
-    return param;
-}
-
-void
-wdm_monitor_callback_param_free(WDM_PMonitorCallbackParam param)
-{
-    free(param);
+#include "wdm.h"
+
+#include "memory.h"
+#include "entry.h"
+#include "queue.h"
+
+#include "monitor.h"
+
+WDM_PMonitor
+wdm_monitor_new()
+{
+    WDM_PMonitor monitor;
+
+    monitor = WDM_ALLOC(WDM_Monitor);
+
+    monitor->running = FALSE;
+
+    monitor->head = NULL;
+    monitor->monitoring_thread = INVALID_HANDLE_VALUE;
+
+    monitor->changes = wdm_queue_new();
+
+    monitor->process_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+    monitor->stop_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+    if ( ! InitializeCriticalSectionAndSpinCount(&monitor->lock,
+            0x00000400) ) // TODO: look into the best value for spinning.
+    {
+        rb_raise(eWDM_Error, "Can't create a lock for the monitor");
+    }
+
+    return monitor;
+}
+
+void
+wdm_monitor_free(WDM_PMonitor monitor)
+{
+    if ( monitor->monitoring_thread != INVALID_HANDLE_VALUE ) CloseHandle(monitor->monitoring_thread);
+
+    wdm_entry_list_free(monitor->head);
+    wdm_queue_free(monitor->changes);
+    DeleteCriticalSection(&monitor->lock);
+    CloseHandle(monitor->process_event); // TODO: Look into why this crashes the app when exiting!
+    CloseHandle(monitor->stop_event);
+
+    free(monitor);
+}
+
+void
+wdm_monitor_update_head(WDM_PMonitor monitor, WDM_PEntry new_head)
+{
+    EnterCriticalSection(&monitor->lock);
+        new_head->next = monitor->head;
+        monitor->head = new_head;
+    LeaveCriticalSection(&monitor->lock);
+}
+
+WDM_PMonitorCallbackParam
+wdm_monitor_callback_param_new(WDM_PMonitor monitor, WDM_PEntry entry)
+{
+    WDM_PMonitorCallbackParam param;
+
+    param = WDM_ALLOC(WDM_MonitorCallbackParam);
+
+    param->monitor = monitor;
+    param->entry = entry;
+
+    return param;
+}
+
+void
+wdm_monitor_callback_param_free(WDM_PMonitorCallbackParam param)
+{
+    free(param);
 }