proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-08-08 11:56:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid a strdup call in __wasilibc_populate_libpreopen. (#128)

Browse Source 
* 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 ?:.
This commit is contained in:
Dan Gohman 2019-11-08 11:31:44 -08:00 committed by GitHub
parent 70099d4d1c
commit 5216983ad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libc-bottom-half/libpreopen/libpreopen.c
View File

@ -452,13 +452,15 @@ po_map_assertvalid(void)
#endif #endif
/// Register the given pre-opened file descriptor under the given path. /// 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(); po_map_assertvalid();
assert(fd >= 0); assert(fd >= 0);
assert(path != NULL); assert(name != NULL);
if (global_map.length == global_map.capacity) { if (global_map.length == global_map.capacity) {
int n = po_map_enlarge(); 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? 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++]; struct po_map_entry *entry = &global_map.entries[global_map.length++];
entry->name = name; entry->name = name;
@ -494,6 +491,16 @@ __wasilibc_register_preopened_fd(int fd, const char *path)
return 0; 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 int
__wasilibc_find_relpath( __wasilibc_find_relpath(
const char *path, const char *path,
@ -583,12 +590,11 @@ __wasilibc_populate_libpreopen(void)
} }
path[prestat.u.dir.pr_name_len] = '\0'; 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); free(path);
return __WASI_ENOMEM; return __WASI_ENOMEM;
} }
free(path);
break; break;
} }
default: default: