A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MSVC] 32bits/64bits is declared that way on this arch
[simgrid.git]
/
src
/
xbt
/
xbt_os_thread.c
diff --git
a/src/xbt/xbt_os_thread.c
b/src/xbt/xbt_os_thread.c
index
b97d90e
..
d7545b4
100644
(file)
--- a/
src/xbt/xbt_os_thread.c
+++ b/
src/xbt/xbt_os_thread.c
@@
-2,12
+2,21
@@
/* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD */
/* in SG, when using CONTEXT_UCONTEXT, xbt_os_thread_stub is used instead */
/* Used in RL to get win/lin portability, and in SG when CONTEXT_THREAD */
/* in SG, when using CONTEXT_UCONTEXT, xbt_os_thread_stub is used instead */
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#if defined(WIN32)
+#elif defined(__MACH__) && defined(__APPLE__)
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#else
+#include <unistd.h>
+#endif
+
#include "internal_config.h"
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "internal_config.h"
#include "xbt/sysdep.h"
#include "xbt/ex.h"
@@
-21,8
+30,9
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
"Synchronization mechanism (OS-level)");
/* ********************************* PTHREAD IMPLEMENTATION ************************************ */
"Synchronization mechanism (OS-level)");
/* ********************************* PTHREAD IMPLEMENTATION ************************************ */
-#if
def HAVE_PTHREAD_H
+#if
ndef _XBT_WIN32
+#include <pthread.h>
#include <limits.h>
#include <semaphore.h>
#include <limits.h>
#include <semaphore.h>
@@
-31,13
+41,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_os, xbt,
#include <sched.h>
#endif
#include <sched.h>
#endif
-#ifdef HAVE_MUTEX_TIMEDLOCK
-/* redefine the function header since we fail to get this from system headers on amd (at least) */
-int pthread_mutex_timedlock(pthread_mutex_t * mutex,
- const struct timespec *abs_timeout);
-#endif
-
-
/* use named sempahore when sem_init() does not work */
#ifndef HAVE_SEM_INIT
static int next_sem_ID = 0;
/* use named sempahore when sem_init() does not work */
#ifndef HAVE_SEM_INIT
static int next_sem_ID = 0;
@@
-577,7
+580,7
@@
xbt_os_sem_t xbt_os_sem_init(unsigned int value)
res->name[13] = '\0';
res->ps = sem_open(res->name, O_CREAT, 0644, value);
}
res->name[13] = '\0';
res->ps = sem_open(res->name, O_CREAT, 0644, value);
}
- if (
(res->ps == (sem_t *) SEM_FAILED)
)
+ if (
res->ps == (sem_t *) SEM_FAILED
)
THROWF(system_error, errno, "sem_open() failed: %s", strerror(errno));
/* Remove the name from the semaphore namespace: we never join on it */
THROWF(system_error, errno, "sem_open() failed: %s", strerror(errno));
/* Remove the name from the semaphore namespace: we never join on it */
@@
-1256,7
+1259,7
@@
int xbt_os_get_numcores(void) {
SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo);
return sysinfo.dwNumberOfProcessors;
SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo);
return sysinfo.dwNumberOfProcessors;
-#elif
MACOS
+#elif
defined(__APPLE__) && defined(__MACH__)
int nm[2];
size_t len = 4;
uint32_t count;
int nm[2];
size_t len = 4;
uint32_t count;