Changeset b76a7329 in mainline

Timestamp:

2011-08-19T17:29:40Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7b2a7ad

Parents:

1c99eae

Message:

make async_sess_t and async_exch_t structures private
(to avoid any possible temptation to access their members directly)

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (2 diffs)
• generic/async_obsolete.c (modified) (2 diffs)
• generic/private/async.h (modified) (1 diff)
• include/async.h (modified) (2 diffs)

uspace/lib/c/generic/async.c ¶

@@ -98 +98 @@
 #include <ipc/ipc.h>
 #include <async.h>
+#include "private/async.h"
 #undef LIBC_ASYNC_C_
 
@@ -113 +114 @@
 #include <stdlib.h>
 #include <macros.h>
-#include "private/async.h"
 
 #define CLIENT_HASH_TABLE_BUCKETS  32

uspace/lib/c/generic/async_obsolete.c ¶

@@ -38 +38 @@
 #include <async.h>
 #include <async_obsolete.h>
+#include "private/async.h"
 #undef LIBC_ASYNC_C_
 #undef LIBC_ASYNC_OBSOLETE_C_
@@ -44 +45 @@
 #include <malloc.h>
 #include <errno.h>
-#include "private/async.h"
 
 /** Send message and return id of the sent message.

uspace/lib/c/generic/private/async.h ¶

@@ -36 +36 @@
 #define LIBC_PRIVATE_ASYNC_H_
 
-#include <ipc/common.h>
+#include <async.h>
 #include <adt/list.h>
 #include <fibril.h>
+#include <fibril_synch.h>
 #include <sys/time.h>
 #include <bool.h>
+
+/** Session data */
+struct _async_sess {
+        /** List of inactive exchanges */
+        list_t exch_list;
+        
+        /** Exchange management style */
+        exch_mgmt_t mgmt;
+        
+        /** Session identification */
+        int phone;
+        
+        /** First clone connection argument */
+        sysarg_t arg1;
+        
+        /** Second clone connection argument */
+        sysarg_t arg2;
+        
+        /** Third clone connection argument */
+        sysarg_t arg3;
+        
+        /** Exchange mutex */
+        fibril_mutex_t mutex;
+        
+        /** Number of opened exchanges */
+        atomic_t refcnt;
+};
+
+/** Exchange data */
+struct _async_exch {
+        /** Link into list of inactive exchanges */
+        link_t sess_link;
+        
+        /** Link into global list of inactive exchanges */
+        link_t global_link;
+        
+        /** Session pointer */
+        async_sess_t *sess;
+        
+        /** Exchange identification */
+        int phone;
+};
 
 /** Structures of this type are used to track the timeout events. */

uspace/lib/c/include/async.h ¶

@@ -42 +42 @@
 #include <ipc/common.h>
 #include <fibril.h>
-#include <fibril_synch.h>
 #include <sys/time.h>
 #include <atomic.h>
@@ -96 +95 @@
 } exch_mgmt_t;
 
-/** Session data */
-typedef struct {
-        /** List of inactive exchanges */
-        list_t exch_list;
-        
-        /** Exchange management style */
-        exch_mgmt_t mgmt;
-        
-        /** Session identification */
-        int phone;
-        
-        /** First clone connection argument */
-        sysarg_t arg1;
-        
-        /** Second clone connection argument */
-        sysarg_t arg2;
-        
-        /** Third clone connection argument */
-        sysarg_t arg3;
-        
-        /** Exchange mutex */
-        fibril_mutex_t mutex;
-        
-        /** Number of opened exchanges */
-        atomic_t refcnt;
-} async_sess_t;
-
-/** Exchange data */
-typedef struct {
-        /** Link into list of inactive exchanges */
-        link_t sess_link;
-        
-        /** Link into global list of inactive exchanges */
-        link_t global_link;
-        
-        /** Session pointer */
-        async_sess_t *sess;
-        
-        /** Exchange identification */
-        int phone;
-} async_exch_t;
+/** Forward declarations */
+struct _async_exch;
+struct _async_sess;
+
+typedef struct _async_sess async_sess_t;
+typedef struct _async_exch async_exch_t;
 
 extern atomic_t threads_in_ipc_wait;