Changeset 9f272d9 in mainline

Timestamp:

2018-06-19T19:43:42Z (6 years ago)

Author:

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

Branches:

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

Children:

5c76cc61

Parents:

47be512

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-31 16:26:54)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-19 19:43:42)

Message:

Statically allocate session_ns.

Location:

uspace/lib/c/generic

Files:

• async/client.c (modified) (3 diffs)
• ns.c (modified) (1 diff)
• private/ns.h (modified) (1 diff)

uspace/lib/c/generic/async/client.c

@@ -99 +99 @@
 #include <async.h>
 #include "../private/async.h"
+#include "../private/ns.h"
 #undef LIBC_ASYNC_C_
 
@@ -122 +123 @@
 
 /** Naming service session */
-async_sess_t *session_ns;
+async_sess_t session_ns;
 
 /** Message data */
@@ -210 +211 @@
 void __async_client_init(void)
 {
-        session_ns = (async_sess_t *) malloc(sizeof(async_sess_t));
-        if (session_ns == NULL)
-                abort();
-
-        session_ns->iface = 0;
-        session_ns->mgmt = EXCHANGE_ATOMIC;
-        session_ns->phone = PHONE_NS;
-        session_ns->arg1 = 0;
-        session_ns->arg2 = 0;
-        session_ns->arg3 = 0;
-
-        fibril_mutex_initialize(&session_ns->remote_state_mtx);
-        session_ns->remote_state_data = NULL;
-
-        list_initialize(&session_ns->exch_list);
-        fibril_mutex_initialize(&session_ns->mutex);
-        atomic_set(&session_ns->refcnt, 0);
+        session_ns.iface = 0;
+        session_ns.mgmt = EXCHANGE_ATOMIC;
+        session_ns.phone = PHONE_NS;
+        session_ns.arg1 = 0;
+        session_ns.arg2 = 0;
+        session_ns.arg3 = 0;
+
+        fibril_mutex_initialize(&session_ns.remote_state_mtx);
+        session_ns.remote_state_data = NULL;
+
+        list_initialize(&session_ns.exch_list);
+        fibril_mutex_initialize(&session_ns.mutex);
+        atomic_set(&session_ns.refcnt, 0);
 }
 

uspace/lib/c/generic/ns.c

@@ -155 +155 @@
 
         if (sess_ns == NULL) {
-                exch = async_exchange_begin(session_ns);
+                exch = async_exchange_begin(&session_ns);
                 sess_ns = async_connect_me_to_iface(exch, 0, 0, 0);
                 async_exchange_end(exch);

uspace/lib/c/generic/private/ns.h

@@ -38 +38 @@
 #include <async.h>
 
-extern async_sess_t *session_ns;
+extern async_sess_t session_ns;
 
 #endif