From: Dan Gohman <sunfish@mozilla.com>
Date: Fri, 8 Nov 2019 19:31:44 +0000 (-0800)
Subject: Avoid a `strdup` call in `__wasilibc_populate_libpreopen`. (#128)
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5216983ad7f8cdda9d2a5e64426b3c1b58b9b98f;p=wasi-libc.git

Avoid a `strdup` call in `__wasilibc_populate_libpreopen`. (#128)

* Avoid a `strdup` call in `__wasilibc_populate_libpreopen`.

Optimize `__wasilibc_populate_libpreopen` to avoid calling `strdup` in
the common case where it's called from `__wasilibc_populate_libpreopen`.

* Convert an if into a ?:.
---

diff --git a/libc-bottom-half/libpreopen/libpreopen.c b/libc-bottom-half/libpreopen/libpreopen.c
index 5cded23..7ea2542 100644
--- a/libc-bottom-half/libpreopen/libpreopen.c
+++ b/libc-bottom-half/libpreopen/libpreopen.c
@@ -452,13 +452,15 @@ po_map_assertvalid(void)
 #endif
 
 /// Register the given pre-opened file descriptor under the given path.
-int
-__wasilibc_register_preopened_fd(int fd, const char *path)
+///
+/// This function takes ownership of `name`.
+static int
+internal_register_preopened_fd(int fd, const char *name)
 {
     po_map_assertvalid();
 
     assert(fd >= 0);
-    assert(path != NULL);
+    assert(name != NULL);
 
     if (global_map.length == global_map.capacity) {
         int n = po_map_enlarge();
@@ -477,11 +479,6 @@ __wasilibc_register_preopened_fd(int fd, const char *path)
         return -1; // TODO: Add an infallible way to get the rights?
     }
 
-    const char *name = strdup(path);
-    if (name == NULL) {
-        return -1;
-    }
-
     struct po_map_entry *entry = &global_map.entries[global_map.length++];
 
     entry->name = name;
@@ -494,6 +491,16 @@ __wasilibc_register_preopened_fd(int fd, const char *path)
     return 0;
 }
 
+/// Register the given pre-opened file descriptor under the given path.
+///
+/// This function does not take ownership of `path`.
+int
+__wasilibc_register_preopened_fd(int fd, const char *path)
+{
+    const char *name = strdup(path);
+    return name == NULL ? -1 : __wasilibc_register_preopened_fd(fd, name);
+}
+
 int
 __wasilibc_find_relpath(
     const char *path,
@@ -583,12 +590,11 @@ __wasilibc_populate_libpreopen(void)
             }
             path[prestat.u.dir.pr_name_len] = '\0';
 
-            if (__wasilibc_register_preopened_fd(fd, path) != 0) {
+            if (internal_register_preopened_fd(fd, path) != 0) {
                 free(path);
                 return __WASI_ENOMEM;
             }
 
-            free(path);
             break;
         }
         default: