Changeset 7cce333 in mainline

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

Location:

uspace

Files:

• lib/c/generic/loc.c (modified) (1 diff)
• lib/c/include/ipc/common.h (modified) (1 diff)
• lib/gui/window.c (modified) (1 diff)
• srv/hid/compositor/compositor.c (modified) (1 diff)
• srv/locsrv/locsrv.c (modified) (2 diffs)
• srv/sysman/units/unit_mnt.c (modified) (1 diff)
• srv/sysman/units/unit_mnt.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/lib/c/generic/loc.c

@@ -329 +329 @@
         async_exch_t *exch;
 
-        if ((flags & IPC_FLAG_BLOCKING) || flags & IPC_FLAG_AUTOSTART)
+        if ((flags & IPC_FLAG_BLOCKING))
                 exch = loc_exchange_begin_blocking(INTERFACE_LOC_CONSUMER);
         else {

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

@@ -43 +43 @@
 
 #define IPC_FLAG_BLOCKING   0x01
-// TODO autostart flag may be united with blocking, this should be later made
-//      implicit, documented or refactor pairs of xxx and xxx_blocking methods
-#define IPC_FLAG_AUTOSTART  0x02
+
+/**
+ * IPC_FLAG_AUTOSTART_ is for use in brokers only. In clinet code use
+ * IPC_AUTOSTART that includes implies blocking behavior. */
+#define IPC_FLAG_AUTOSTART_  0x02
+
+/**
+ * Similar to blocking IPC_FLAG_BLOCKING behavior, broker will attempt to
+ * start the server.
+ */
+#define IPC_AUTOSTART (IPC_FLAG_BLOCKING | IPC_FLAG_AUTOSTART_)
 
 typedef ipc_data_t ipc_call_t;

uspace/lib/gui/window.c

@@ -615 +615 @@
         win->focus = NULL;
         win->surface = NULL;
-
-        unsigned int ipc_flags = IPC_FLAG_AUTOSTART;
+        
+        unsigned int ipc_flags = IPC_AUTOSTART;
         service_id_t reg_dsid;
         errno_t rc = loc_service_get_id(winreg, &reg_dsid, ipc_flags);

uspace/srv/hid/compositor/compositor.c

@@ -2183 +2183 @@
         async_sess_t *sess;
         service_id_t dsid;
-        unsigned int flags = IPC_FLAG_AUTOSTART;
+        unsigned int flags = IPC_AUTOSTART;
 
         errno_t rc = loc_service_get_id(svc, &dsid, flags);

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);

uspace/srv/sysman/units/unit_mnt.c

@@ -210 +210 @@
 
         mnt_data.flags |= u_mnt->blocking ? IPC_FLAG_BLOCKING : 0;
-        mnt_data.flags |= u_mnt->autostart ? IPC_FLAG_AUTOSTART : 0;
+        mnt_data.flags |= u_mnt->autostart ? IPC_AUTOSTART : 0;
         mnt_data.unit = unit;
 

uspace/srv/sysman/units/unit_mnt.h

@@ -39 +39 @@
         char *device;
 
-        /** Should be underlying units (FS server, device) be autostarted */
+        /** Should be underlying units (FS server, device) be autostarted
+         * (implies blocking) */
         bool autostart;
 

uspace/srv/vfs/vfs_ops.c

@@ -138 +138 @@
                 fs_handle = fs_name_to_handle(fsname, instance, false);
                 if (!fs_handle) {
-                        if ((flags & IPC_FLAG_AUTOSTART)) {
+                        if ((flags & IPC_FLAG_AUTOSTART_)) {
                                 /*
                                  * Temporarily release the lock, we don't need it while