Changeset bc56f30 in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2019-05-27T12:38:26Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0d14c25

Parents:

4d51c60

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-13 16:06:49)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-27 12:38:26)

Message:

Make some libc and libposix headers usable in C++

These headers either get included from standard C++ headers,
or are standard themselves, which means any unnamespaced nonstandard
identifiers are a problem. This commit attempts to fix those
issues, and removes hacks previously used in libcpp to work around it.

File:

• uspace/lib/c/include/fibril_synch.h (modified) (6 diffs)

uspace/lib/c/include/fibril_synch.h

@@ -40 +40 @@
 #include <time.h>
 #include <stdbool.h>
-
-typedef struct {
-        fibril_owner_info_t oi;  /**< Keep this the first thing. */
-        int counter;
-        list_t waiters;
-} fibril_mutex_t;
+#include <_bits/decls.h>
+
+#ifndef __cplusplus
 
 #define FIBRIL_MUTEX_INITIALIZER(name) \
@@ -58 +55 @@
 #define FIBRIL_MUTEX_INITIALIZE(name) \
         fibril_mutex_t name = FIBRIL_MUTEX_INITIALIZER(name)
-
-typedef struct {
-        fibril_owner_info_t oi;  /**< Keep this the first thing. */
-        unsigned int writers;
-        unsigned int readers;
-        list_t waiters;
-} fibril_rwlock_t;
 
 #define FIBRIL_RWLOCK_INITIALIZER(name) \
@@ -79 +69 @@
         fibril_rwlock_t name = FIBRIL_RWLOCK_INITIALIZER(name)
 
-typedef struct {
-        list_t waiters;
-} fibril_condvar_t;
-
 #define FIBRIL_CONDVAR_INITIALIZER(name) \
         { \
@@ -90 +76 @@
 #define FIBRIL_CONDVAR_INITIALIZE(name) \
         fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
+
+#define FIBRIL_SEMAPHORE_INITIALIZER(name, cnt) \
+        { \
+                .count = (cnt), \
+                .waiters = LIST_INITIALIZER((name).waiters), \
+        }
+
+#define FIBRIL_SEMAPHORE_INITIALIZE(name, cnt) \
+        fibril_semaphore_t name = FIBRIL_SEMAPHORE_INITIALIZER(name, cnt)
+
+#endif
+
+__HELENOS_DECLS_BEGIN;
+
+typedef struct {
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
+        int counter;
+        list_t waiters;
+} fibril_mutex_t;
+
+typedef struct {
+        fibril_owner_info_t oi;  /**< Keep this the first thing. */
+        unsigned int writers;
+        unsigned int readers;
+        list_t waiters;
+} fibril_rwlock_t;
+
+typedef struct {
+        list_t waiters;
+} fibril_condvar_t;
 
 typedef void (*fibril_timer_fun_t)(void *);
@@ -134 +150 @@
 } fibril_semaphore_t;
 
-#define FIBRIL_SEMAPHORE_INITIALIZER(name, cnt) \
-        { \
-                .count = (cnt), \
-                .waiters = LIST_INITIALIZER((name).waiters), \
-        }
-
-#define FIBRIL_SEMAPHORE_INITIALIZE(name, cnt) \
-        fibril_semaphore_t name = FIBRIL_SEMAPHORE_INITIALIZER(name, cnt)
-
 extern void __fibril_synch_init(void);
 extern void __fibril_synch_fini(void);
@@ -190 +197 @@
 extern void mpsc_close(mpsc_t *);
 
+__HELENOS_DECLS_END;
+
 #endif