Changeset dda2602 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2019-08-03T09:41:07Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

dd5c623

Parents:

c0e4fc50

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-08 11:10:06)

git-committer:

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

Message:

sysman: Create units to start up to compositor

• add necessary units to support basic GUI (barber, vterm)
• lacking autostart is compensated with explicit dependencies
• IPC_FLAG_AUTOSTART in compositor and locsrv fix
• paths to v* binaries
• refactored job closure creation

Conflicts:

boot/Makefile.common
uspace/app/vlaunch/vlaunch.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/locsrv/locsrv.c

File:

• uspace/srv/locsrv/locsrv.c (modified) (6 diffs)

uspace/srv/locsrv/locsrv.c

@@ -359 +359 @@
         }
 
-        printf("%s(%s) before\n", __func__, unit_name);
+        //printf("%s(%s) before\n", __func__, unit_name);//DEBUG
         int rc = sysman_unit_start(unit_name, IPC_FLAG_BLOCKING);
-        printf("%s(%s) after %i\n", __func__, unit_name, rc);
+        //printf("%s(%s) after %i\n", __func__, unit_name, rc);//DEBUG
         free(unit_name);
         free(service_name);
@@ -566 +566 @@
         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);
         fibril_condvar_broadcast(&services_list_cv);
@@ -801 +798 @@
         const loc_service_t *svc;
         int flags = ipc_get_arg1(*icall);
+        bool start_requested = false;
         
 recheck:
@@ -813 +811 @@
          */
         if (svc == NULL) {
-                printf("%s: service '%s/%s' not found\n", NAME, ns_name, name);
+                //printf("%s: service '%s/%s' not found\n", NAME, ns_name, name);//DEBUG
                 if (flags & (IPC_FLAG_AUTOSTART | IPC_FLAG_BLOCKING)) {
                         /* TODO:
@@ -821 +819 @@
                          * for ID might be someone else than those connecting)
                          */
-                        if (flags & IPC_FLAG_AUTOSTART) {
+                        if (!start_requested && (flags & IPC_FLAG_AUTOSTART)) {
                                 rc = loc_service_request_start(ns_name, name);
                                 if (rc != EOK) {
                                         goto finish;
                                 }
+                                start_requested = true;
                         }
 
@@ -834 +833 @@
                 rc = ENOENT;
         } else {
-                printf("%s: service '%s/%s' FOUND\n", NAME, ns_name, name);
+                //printf("%s: service '%s/%s' FOUND\n", NAME, ns_name, name);//DEBUG
                 rc = EOK;
         }