Changeset 5559712 in mainline for uspace/srv/locsrv

Timestamp:

2019-08-03T09:28:50Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

c0e4fc50

Parents:

2dda1d4

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-07 11:49:47)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 09:28:50)

Message:

sysman: Naive autostart instrumentation of locsrv

• Add IPC_FLAG_AUTOSTART flag.
• libsysman: sysman's broker and control API.
• Simple implementation of service unit, exposee verification is missing.
• Simple mapping of exposee to unit name in locsrv.
• Temporary debug prints in locsrv.

Conflicts:

boot/Makefile.common
boot/arch/amd64/Makefile.inc
uspace/lib/c/include/ipc/services.h
uspace/srv/locsrv/locsrv.c

Location:

uspace/srv/locsrv

Files:

• Makefile (modified) (1 diff)
• locsrv.c (modified) (7 diffs)

uspace/srv/locsrv/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
+LIBS = $(LIBSYSMAN_PREFIX)/libsysman.a
+EXTRA_CFLAGS += -I$(LIBSYSMAN_PREFIX)/include
 BINARY = locsrv
 STATIC_NEEDED = y

uspace/srv/locsrv/locsrv.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
+#include <async.h>
+#include <errno.h>
+#include <ipc/loc.h>
 #include <ipc/services.h>
-#include <ns.h>
-#include <async.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdbool.h>
 #include <fibril_synch.h>
 #include <macros.h>
+#include <ns.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
 #include <str_error.h>
-#include <ipc/loc.h>
-#include <assert.h>
+#include <sysman/broker.h>
+#include <sysman/ctl.h>
 
 #include "category.h"
@@ -331 +333 @@
         free(service->name);
         free(service);
+}
+
+static int loc_service_request_start(const char *ns_name, const char *name)
+{
+        char *service_name = NULL;
+
+        if (str_cmp(ns_name, LOC_DEVICE_NAMESPACE) == 0) {
+                asprintf(&service_name, "%s", SERVICE_NAME_DEVMAN);
+        } else if (str_cmp(ns_name, "") == 0) {
+                asprintf(&service_name, "%s", name);
+        } else {
+                asprintf(&service_name, "%s%s%s",
+                    ns_name, LOC_UNIT_NAMESPACE_SEPARATOR, name);
+        }
+        if (service_name == NULL) {
+                return ENOMEM;
+        }
+
+        char *unit_name;
+        asprintf(&unit_name, "%s%c%s",
+            service_name, UNIT_NAME_SEPARATOR, UNIT_SVC_TYPE_NAME);
+        if (unit_name == NULL) {
+                free(service_name);
+                return ENOMEM;
+        }
+
+        printf("%s(%s) before\n", __func__, unit_name);
+        int rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
+        printf("%s(%s) after %i\n", __func__, unit_name, rc);
+        free(unit_name);
+        free(service_name);
+        return rc;
 }
 
@@ -531 +565 @@
 
         list_append(&service->server_services, &service->server->services);
+        
+        printf("%s: broadcast new service '%s/%s'\n", NAME, namespace->name,
+            service->name);
 
         fibril_mutex_unlock(&service->server->services_mutex);
@@ -542 +579 @@
  *
  */
-static void loc_service_unregister(ipc_call_t *icall, loc_server_t *server)
+static void loc_service_unregister(ipc_callid_t iid, ipc_call_t *icall,
+    loc_server_t *server)
 {
         loc_service_t *svc;
@@ -762 +800 @@
         fibril_mutex_lock(&services_list_mutex);
         const loc_service_t *svc;
-
+        int flags = ipc_get_arg1(*icall);
+        
 recheck:
 
@@ -771 +810 @@
 
         /*
-         * Device was not found.
+         * Service was not found.
          */
         if (svc == NULL) {
-                if (ipc_get_arg1(icall) & IPC_FLAG_BLOCKING) {
-                        /* Blocking lookup */
+                printf("%s: service '%s/%s' not found\n", NAME, ns_name, name);
+                if (flags & (IPC_FLAG_AUTOSTART | IPC_FLAG_BLOCKING)) {
+                        /* TODO:
+                         * consider non-blocking service start, return
+                         * some dummy id and block only after connection
+                         * request (actually makes more sense as those who asks
+                         * for ID might be someone else than those connecting)
+                         */
+                        if (flags & IPC_FLAG_AUTOSTART) {
+                                rc = loc_service_request_start(ns_name, name);
+                                if (rc != EOK) {
+                                        goto finish;
+                                }
+                        }
+
                         fibril_condvar_wait(&services_list_cv,
                             &services_list_mutex);
                         goto recheck;
                 }
-
-                async_answer_0(icall, ENOENT);
-                free(ns_name);
-                free(name);
-                fibril_mutex_unlock(&services_list_mutex);
-                return;
-        }
-
-        async_answer_1(icall, EOK, svc->id);
-
+                rc = ENOENT;
+        } else {
+                printf("%s: service '%s/%s' FOUND\n", NAME, ns_name, name);
+                rc = EOK;
+        }
+
+finish:
+        if (rc == EOK) {
+                async_answer_1(iid, EOK, svc->id);
+        } else {
+                async_answer_0(iid, rc);
+        }
+        
         fibril_mutex_unlock(&services_list_mutex);
         free(ns_name);
@@ -1565 +1620 @@
         if (rc != EOK) {
                 printf("%s: Error while registering broker service: %s\n", NAME, str_error(rc));
+
+        /* Let sysman know we are broker */
+        printf("%s: sysman_broker_register : pre\n", NAME);
+        rc = sysman_broker_register();
+        printf("%s: sysman_broker_register : post\n", NAME);
+        if (rc != EOK) {
+                printf("%s: Error registering at sysman (%i)\n", NAME, rc);
                 return rc;
         }