Changeset 9a2eb14 in mainline for uspace/lib/c/generic/irc.c

Timestamp:

2017-10-15T15:04:15Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1974f56a

Parents:

75911d24

Message:

As a temporary measure, let IRC servers use the location service for DDF-compatible naming. This is needed until all interrupt controller drivers are in DDF and we can switch to DDF-based naming.

File:

• uspace/lib/c/generic/irc.c (modified) (2 diffs)

uspace/lib/c/generic/irc.c

@@ -35 +35 @@
 #include <assert.h>
 #include <errno.h>
+#include <fibril_synch.h>
 #include <ipc/irc.h>
 #include <ipc/services.h>
 #include <irc.h>
-#include <ns.h>
+#include <loc.h>
+#include <stdlib.h>
 #include <sysinfo.h>
 
@@ -49 +51 @@
 static int irc_init(void)
 {
+        category_id_t irc_cat;
+        service_id_t *svcs;
+        size_t count;
+        int rc;
+
         assert(irc_sess == NULL);
+        rc = loc_category_get_id("irc", &irc_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK)
+                return EIO;
 
-        irc_sess = service_connect_blocking(SERVICE_IRC, INTERFACE_IRC, 0);
+        while (true) {
+                rc = loc_category_get_svcs(irc_cat, &svcs, &count);
+                if (rc != EOK)
+                        return EIO;
+
+                if (count > 0)
+                        break;
+
+                free(svcs);
+
+                // XXX This is just a temporary hack
+                fibril_usleep(500 * 1000);
+        }
+
+        irc_sess = loc_service_connect(svcs[0], INTERFACE_IRC,
+            IPC_FLAG_BLOCKING);
+        free(svcs);
 
         if (irc_sess == NULL)