WebSVN – HelenOS – Diff – /branches/tracing/uspace/srv/vfs/vfs_lookup.c

  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup fs
  * @{
  */
 /**
- * @file    vfs_lookup.c
+ * @file vfs_lookup.c
  * @brief
  */
 #include "vfs.h"
 #include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
 #include <string.h>
 #include <stdarg.h>
 #include <bool.h>
-#include <futex.h>
+#include <fibril_sync.h>
-#include <libadt/list.h>
+#include <adt/list.h>
 #include <vfs/canonify.h>
-#define min(a, b)   ((a) < (b) ? (a) : (b))
+#define min(a, b)  ((a) < (b) ? (a) : (b))
-futex_t plb_futex = FUTEX_INITIALIZER;
+FIBRIL_MUTEX_INITIALIZE(plb_mutex);
-link_t plb_head;    /**< PLB entry ring buffer. */
+LIST_INITIALIZE(plb_head);  /**< PLB entry ring buffer. */
 uint8_t *plb = NULL;
 /** Perform a path lookup.
+ *
- * @param path      Path to be resolved; it must be a NULL-terminated
+ * @param path    Path to be resolved; it must be a NULL-terminated
- *          string.
+ *                string.
- * @param lflag     Flags to be used during lookup.
+ * @param lflag   Flags to be used during lookup.
- * @param result    Empty structure where the lookup result will be stored.
+ * @param result  Empty structure where the lookup result will be stored.
- *          Can be NULL.
+ *                Can be NULL.
- * @param altroot   If non-empty, will be used instead of rootfs as the root
+ * @param altroot If non-empty, will be used instead of rootfs as the root
- *          of the whole VFS tree.
+ *                of the whole VFS tree.
+ *
+ * @return EOK on success or an error code from errno.h.
+ *
- * @return      EOK on success or an error code from errno.h.
  */
 int vfs_lookup_internal(char *path, int lflag, vfs_lookup_res_t *result,
     vfs_pair_t *altroot, ...)
+{
     vfs_pair_t *root;
         va_start(ap, altroot);
         index = va_arg(ap, fs_index_t);
         va_end(ap);
+    }
-    futex_down(&plb_futex);
+    fibril_mutex_lock(&plb_mutex);
     plb_entry_t entry;
     link_initialize(&entry.plb_link);
     entry.len = len;
     if (first <= last) {
         if ((last - first) + 1 < len) {
             /*
              * The buffer cannot absorb the path.
              */
-            futex_up(&plb_futex);
+            fibril_mutex_unlock(&plb_mutex);
             return ELIMIT;
+        }
     } else {
         if (PLB_SIZE - ((first - last) + 1) < len) {
             /*
              * The buffer cannot absorb the path.
              */
-            futex_up(&plb_futex);
+            fibril_mutex_unlock(&plb_mutex);
             return ELIMIT;
+        }
+    }
     /*
      * Claim PLB space by inserting the entry into the PLB entry ring
      * buffer.
      */
     list_append(&entry.plb_link, &plb_head);
-    futex_up(&plb_futex);
+    fibril_mutex_unlock(&plb_mutex);
     /*
      * Copy the path into PLB.
      */
     size_t cnt1 = min(len, (PLB_SIZE - first) + 1);
     memcpy(&plb[first], path, cnt1);
     memcpy(plb, &path[cnt1], cnt2);
     ipc_call_t answer;
     int phone = vfs_grab_phone(root->fs_handle);
-    aid_t req = async_send_5(phone, VFS_LOOKUP, (ipcarg_t) first,
+    aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
         (ipcarg_t) (first + len - 1) % PLB_SIZE,
         (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
         &answer);
-    vfs_release_phone(phone);
     ipcarg_t rc;
     async_wait_for(req, &rc);
+    vfs_release_phone(phone);
-    futex_down(&plb_futex);
+    fibril_mutex_lock(&plb_mutex);
     list_remove(&entry.plb_link);
     /*
      * Erasing the path from PLB will come handy for debugging purposes.
      */
     memset(&plb[first], 0, cnt1);
     memset(plb, 0, cnt2);
-    futex_up(&plb_futex);
+    fibril_mutex_unlock(&plb_mutex);
-    if ((rc == EOK) && result) {
+    if ((rc == EOK) && (result)) {
         result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
         result->triplet.dev_handle = (dev_handle_t) IPC_GET_ARG2(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG3(answer);
         result->size = (size_t) IPC_GET_ARG4(answer);
         result->lnkcnt = (unsigned) IPC_GET_ARG5(answer);
+    }
     return rc;
+}
+/** Perform a node open operation.
+ *
+ * @return EOK on success or an error code from errno.h.
+ *
+ */
+int vfs_open_node_internal(vfs_lookup_res_t *result)
+{
+    int phone = vfs_grab_phone(result->triplet.fs_handle);
+    ipc_call_t answer;
+    aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
+        (ipcarg_t) result->triplet.dev_handle,
+        (ipcarg_t) result->triplet.index, &answer);
+    ipcarg_t rc;
+    async_wait_for(req, &rc);
+    vfs_release_phone(phone);
+    if (rc == EOK) {
+        result->size = (size_t) IPC_GET_ARG1(answer);
+        result->lnkcnt = (unsigned) IPC_GET_ARG2(answer);
+        if (IPC_GET_ARG3(answer) & L_FILE)
+            result->type = VFS_NODE_FILE;
+        else if (IPC_GET_ARG3(answer) & L_DIRECTORY)
+            result->type = VFS_NODE_DIRECTORY;
+        else
+            result->type = VFS_NODE_UNKNOWN;
+    }
+    return rc;
+}
 /**
  * @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/uspace/srv/vfs/vfs_lookup.c – Rev 3675 → 4692