Changeset fff7ef4 in mainline

Timestamp:

2013-04-26T07:34:42Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

48171fc4

Parents:

287d729

Message:

Make dnsr client initialization implicit (to allow for multiple consumers in the same program).

Location:

uspace

Files:

• app/dnsres/dnsres.c (modified) (1 diff)
• app/nettest1/nettest1.c (modified) (1 diff)
• app/nettest2/nettest2.c (modified) (1 diff)
• app/nettest3/nettest3.c (modified) (1 diff)
• app/nterm/conn.c (modified) (1 diff)
• app/ping/ping.c (modified) (1 diff)
• lib/c/generic/dnsr.c (modified) (5 diffs)

uspace/app/dnsres/dnsres.c

@@ -65 +65 @@
         char *saddr;
 
-        rc = dnsr_init();
-        if (rc != EOK) {
-                printf(NAME ": Failed connecting to DNS resolution service "
-                    "(%d).\n", rc);
-                return 1;
-        }
-
         if (argc != 2) {
                 print_syntax();

uspace/app/nettest1/nettest1.c

@@ -354 +354 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_init();
-                if (rc != EOK) {
-                        printf("Failed connecting DNS resolution "
-                            "service (%d).\n", rc);
-                        return rc;
-                }
-
                 rc = dnsr_name2host(argv[argc - 1], &hinfo);
                 if (rc != EOK) {

uspace/app/nettest2/nettest2.c

@@ -300 +300 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_init();
-                if (rc != EOK) {
-                        printf("Failed connecting DNS resolution "
-                            "service (%d).\n", rc);
-                        return rc;
-                }
-
                 rc = dnsr_name2host(argv[argc - 1], &hinfo);
                 if (rc != EOK) {

uspace/app/nettest3/nettest3.c

@@ -78 +78 @@
                 if (rc != EOK) {
                         /* Try interpreting as a host name */
-                        rc = dnsr_init();
-                        if (rc != EOK) {
-                                printf("Failed connecting DNS resolution "
-                                    "service (%d).\n", rc);
-                                return rc;
-                        }
-
                         rc = dnsr_name2host(argv[1], &hinfo);
                         if (rc != EOK) {

uspace/app/nterm/conn.c

@@ -85 +85 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_init();
-                if (rc != EOK) {
-                        printf("Failed connecting DNS resolution "
-                            "service (%d).\n", rc);
-                        goto error;
-                }
-
                 rc = dnsr_name2host(addr_s, &hinfo);
                 if (rc != EOK) {

uspace/app/ping/ping.c

@@ -245 +245 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_init();
-                if (rc != EOK) {
-                        printf(NAME ": Failed connecting DNS resolution "
-                            "service (%d).\n", rc);
-                        goto error;
-                }
-
                 rc = dnsr_name2host(argv[argi], &hinfo);
                 if (rc != EOK) {

uspace/lib/c/generic/dnsr.c

@@ -30 +30 @@
 #include <assert.h>
 #include <errno.h>
+#include <fibril_synch.h>
 #include <inet/dnsr.h>
 #include <ipc/dnsr.h>
@@ -37 +38 @@
 #include <str.h>
 
+static FIBRIL_MUTEX_INITIALIZE(dnsr_sess_mutex);
+
 static async_sess_t *dnsr_sess = NULL;
 
-int dnsr_init(void)
+static async_exch_t *dnsr_exchange_begin(void)
 {
+        async_sess_t *sess;
         service_id_t dnsr_svc;
-        int rc;
 
-        assert(dnsr_sess == NULL);
+        fibril_mutex_lock(&dnsr_sess_mutex);
 
-        rc = loc_service_get_id(SERVICE_NAME_DNSR, &dnsr_svc,
-            IPC_FLAG_BLOCKING);
-        if (rc != EOK)
-                return ENOENT;
+        if (dnsr_sess == NULL) {
+                (void) loc_service_get_id(SERVICE_NAME_DNSR, &dnsr_svc,
+                    IPC_FLAG_BLOCKING);
 
-        dnsr_sess = loc_service_connect(EXCHANGE_SERIALIZE, dnsr_svc,
-            IPC_FLAG_BLOCKING);
-        if (dnsr_sess == NULL)
-                return ENOENT;
+                dnsr_sess = loc_service_connect(EXCHANGE_SERIALIZE, dnsr_svc,
+                    IPC_FLAG_BLOCKING);
+        }
 
-        return EOK;
+        sess = dnsr_sess;
+        fibril_mutex_unlock(&dnsr_sess_mutex);
+
+        return async_exchange_begin(sess);
+}
+
+static void dnsr_exchange_end(async_exch_t *exch)
+{
+        async_exchange_end(exch);
 }
 
 int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo)
 {
-        async_exch_t *exch = async_exchange_begin(dnsr_sess);
+        async_exch_t *exch = dnsr_exchange_begin();
         dnsr_hostinfo_t *info;
 
@@ -68 +77 @@
         sysarg_t retval = async_data_write_start(exch, name, str_size(name));
 
-        async_exchange_end(exch);
+        dnsr_exchange_end(exch);
 
         if (retval != EOK) {
@@ -102 +111 @@
 {
         sysarg_t addr;
-        async_exch_t *exch = async_exchange_begin(dnsr_sess);
+        async_exch_t *exch = dnsr_exchange_begin();
 
         int rc = async_req_0_1(exch, DNSR_GET_SRVADDR, &addr);
-        async_exchange_end(exch);
+        dnsr_exchange_end(exch);
 
         if (rc != EOK)
@@ -116 +125 @@
 int dnsr_set_srvaddr(inet_addr_t *srvaddr)
 {
-        async_exch_t *exch = async_exchange_begin(dnsr_sess);
+        async_exch_t *exch = dnsr_exchange_begin();
 
         int rc = async_req_1_0(exch, DNSR_SET_SRVADDR, srvaddr->ipv4);
-        async_exchange_end(exch);
+        dnsr_exchange_end(exch);
 
         if (rc != EOK)