Changeset 7cce333 in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2019-08-07T10:22:06Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

5353f50

Parents:

a097c50

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-10 21:19:03)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 10:22:06)

Message:

sysman: Refined semantics of IPC_FLAG_AUTOSTART

IPC_FLAG_AUTOSTART_ is for internal use in brokers (added underscore).
IPC_AUTOSTART is a flag macro (not a _single_ flag) to be used by clients.

Conflicts:

uspace/lib/c/generic/loc.c
uspace/lib/gui/window.c
uspace/srv/vfs/vfs_ops.c

File:

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

uspace/srv/locsrv/locsrv.c

@@ -855 +855 @@
         if (svc == NULL) {
                 /* 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)
+                 * 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)
+                 *
                  * Note:
                  * service_list_mutex is released as we don't need to keep it
                  * while waiting for start request to finish.
                  */
-                if ((flags & IPC_FLAG_AUTOSTART) && !start_requested) {
+                if ((flags & IPC_FLAG_AUTOSTART_) && !start_requested) {
                         fibril_mutex_unlock(&services_list_mutex);
                         rc = loc_service_request_start(ns_name, name);
@@ -876 +877 @@
                 }
 
-                if ((flags & IPC_FLAG_BLOCKING) || flags & IPC_FLAG_AUTOSTART) {
+                if ((flags & IPC_FLAG_BLOCKING) || flags & IPC_FLAG_AUTOSTART_) {
                         fibril_condvar_wait(&services_list_cv,
                             &services_list_mutex);