Changeset 8d6bcc8c in mainline

Timestamp:

2017-09-25T20:51:51Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7b616e2

Parents:

11d9630

Message:

Move clipboard under location service.

Location:

uspace

Files:

• lib/c/generic/clipboard.c (modified) (2 diffs)
• lib/c/include/ipc/services.h (modified) (1 diff)
• srv/clipboard/clipboard.c (modified) (3 diffs)

uspace/lib/c/generic/clipboard.c

@@ -38 +38 @@
  */
 
+#include <async.h>
 #include <clipboard.h>
-#include <ns.h>
+#include <errno.h>
+#include <fibril_synch.h>
+#include <ipc/clipboard.h>
 #include <ipc/services.h>
-#include <ipc/clipboard.h>
-#include <fibril_synch.h>
-#include <async.h>
+#include <loc.h>
+#include <malloc.h>
 #include <str.h>
-#include <errno.h>
-#include <malloc.h>
 
 static FIBRIL_MUTEX_INITIALIZE(clip_mutex);
@@ -58 +58 @@
 static async_exch_t *clip_exchange_begin(void)
 {
+        service_id_t sid;
+        int rc;
+        
         fibril_mutex_lock(&clip_mutex);
         
-        while (clip_sess == NULL)
-                clip_sess = service_connect_blocking(SERVICE_CLIPBOARD,
-                    INTERFACE_CLIPBOARD, 0);
+        while (clip_sess == NULL) {
+                rc = loc_service_get_id(SERVICE_NAME_CLIPBOARD, &sid,
+                    IPC_FLAG_BLOCKING);
+                if (rc != EOK)
+                        continue;
+                
+                clip_sess = loc_service_connect(sid, INTERFACE_CLIPBOARD,
+                    IPC_FLAG_BLOCKING);
+        }
         
         fibril_mutex_unlock(&clip_mutex);

uspace/lib/c/include/ipc/services.h

@@ -48 +48 @@
         SERVICE_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
-        SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
 } service_t;
 
+#define SERVICE_NAME_CLIPBOARD "clipboard"
 #define SERVICE_NAME_CORECFG  "corecfg"
 #define SERVICE_NAME_DHCP     "net/dhcp"

uspace/srv/clipboard/clipboard.c

@@ -27 +27 @@
  */
 
+#include <async.h>
+#include <errno.h>
+#include <fibril_synch.h>
+#include <ipc/services.h>
+#include <ipc/clipboard.h>
+#include <loc.h>
+#include <malloc.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <async.h>
-#include <ns.h>
-#include <ipc/services.h>
-#include <ipc/clipboard.h>
-#include <malloc.h>
-#include <fibril_synch.h>
-#include <errno.h>
+#include <task.h>
 
 #define NAME  "clipboard"
@@ -43 +44 @@
 static clipboard_tag_t clip_tag = CLIPBOARD_TAG_NONE;
 static FIBRIL_MUTEX_INITIALIZE(clip_mtx);
+static service_id_t svc_id;
 
 static void clip_put_data(ipc_callid_t rid, ipc_call_t *request)
@@ -179 +181 @@
 int main(int argc, char *argv[])
 {
+        int rc;
+        
         printf("%s: HelenOS clipboard service\n", NAME);
-        
         async_set_fallback_port_handler(clip_connection, NULL);
-        int rc = service_register(SERVICE_CLIPBOARD);
-        if (rc != EOK)
+        
+        rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Failed registering server. (%d)\n", NAME, rc);
                 return rc;
+        }
+        
+        rc = loc_service_register(SERVICE_NAME_CLIPBOARD, &svc_id);
+        if (rc != EOK) {
+                printf("%s: Failed registering service. (%d)\n", NAME, rc);
+                return rc;
+        }
         
         printf("%s: Accepting connections\n", NAME);