Skip to content

Add Windows support for LibDAQ #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mahbodbe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Windows support for LibDAQ #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 81 additions & 8 deletions api/daq_base.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,17 @@
#include "config.h"
#endif

// #include <dirent.h>
// #include <dlfcn.h>
#include <dirent.h>

#ifdef _WIN32
#include <winsock2.h>
#include <windows.h>
#else
#include <dlfcn.h>
#endif

#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
Expand All @@ -40,6 +49,56 @@

#define NAME_SIZE 512

#ifdef _WIN32

static char daq_dl_error[256];

static void* daq_dlopen(const char* filename)
{
HMODULE handle = LoadLibraryA(filename);

if (!handle)
{
snprintf(daq_dl_error, sizeof(daq_dl_error),
"Windows error %lu", (unsigned long)GetLastError());
}

return (void*)handle;
}

static void* daq_dlsym(void* handle, const char* symbol)
{
FARPROC proc = GetProcAddress((HMODULE)handle, symbol);

if (!proc)
{
snprintf(daq_dl_error, sizeof(daq_dl_error),
"Windows error %lu", (unsigned long)GetLastError());
}

return (void*)proc;
}

static void daq_dlclose(void* handle)
{
if (handle)
FreeLibrary((HMODULE)handle);
}

static const char* daq_dlerror(void)
{
return daq_dl_error;
}

#else

#define daq_dlopen dlopen
#define daq_dlsym dlsym
#define daq_dlclose dlclose
#define daq_dlerror dlerror

#endif

int daq_verbosity = 0;

typedef struct _daq_list_node
Expand Down Expand Up @@ -184,7 +243,7 @@ static int register_module(const DAQ_ModuleAPI_t *dm, void *dl_handle, const cha
if (node->module->unload)
node->module->unload();
if (node->dl_handle)
dlclose(node->dl_handle);
daq_dlclose(node->dl_handle);
}

DEBUG("Registered daq module: %s\n", dm->name);
Expand All @@ -210,24 +269,28 @@ static int daq_load_dynamic_module(const char *filename)
return DAQ_ERROR;
}

if ((dl_handle = dlopen(filename, RTLD_NOW|RTLD_LOCAL)) == NULL)
#ifdef _WIN32
if ((dl_handle = daq_dlopen(filename)) == NULL)
#else
if ((dl_handle = daq_dlopen(filename, RTLD_NOW|RTLD_LOCAL)) == NULL)
#endif
{
fprintf(stderr, "%s: dlopen: %s\n", filename, dlerror());
fprintf(stderr, "%s: daq_dlopen: %s\n", filename, daq_dlerror());
return DAQ_ERROR;
}

if ((dm = (const DAQ_ModuleAPI_t*)dlsym(dl_handle, "DAQ_MODULE_DATA")) == NULL)
if ((dm = (const DAQ_ModuleAPI_t*)daq_dlsym(dl_handle, "DAQ_MODULE_DATA")) == NULL)
{
fprintf(stderr, "%s: dlsym: %s\n", filename, dlerror());
dlclose(dl_handle);
fprintf(stderr, "%s: daq_dlsym: %s\n", filename, daq_dlerror());
daq_dlclose(dl_handle);
return DAQ_ERROR;
}

if ((rval = register_module(dm, dl_handle, filename)) != DAQ_SUCCESS)
{
if (rval != DAQ_ERROR_EXISTS)
fprintf(stderr, "%s: Failed to register DAQ module.\n", filename);
dlclose(dl_handle);
daq_dlclose(dl_handle);
return DAQ_ERROR;
}

Expand Down Expand Up @@ -271,9 +334,19 @@ DAQ_LINKAGE int daq_load_dynamic_modules(const char *directory_list[])

while ((de = readdir(dirp)) != NULL)
{
// p = strrchr(de->d_name, '.');
// if (!p || strcmp(p, ".so"))
// continue;

p = strrchr(de->d_name, '.');

#ifdef _WIN32
if (!p || strcmp(p, ".dll"))
continue;
#else
if (!p || strcmp(p, ".so"))
continue;
#endif
snprintf(dirpath, sizeof(dirpath), "%s/%s", *directory_list, de->d_name);

ret = daq_load_dynamic_module(dirpath);
Expand Down Expand Up @@ -303,7 +376,7 @@ DAQ_LINKAGE void daq_unload_modules(void)
if (node->module->unload)
node->module->unload();
if (node->dl_handle)
dlclose(node->dl_handle);
daq_dlclose(node->dl_handle);
free(node);
num_modules--;
}
Expand Down