mirror of https://github.com/lukechilds/node.git
Browse Source
Fixes: https://github.com/nodejs/node/issues/10165 Fixes: https://github.com/nodejs/node/issues/9856 Fixes: https://github.com/nodejs/node/issues/10607 Fixes: https://github.com/nodejs/node/issues/11104 PR-URL: https://github.com/nodejs/node/pull/11094 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>v6
cjihrig
8 years ago
38 changed files with 1589 additions and 198 deletions
@ -0,0 +1,334 @@ |
|||
/* Copyright libuv project contributors. All rights reserved.
|
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to |
|||
* deal in the Software without restriction, including without limitation the |
|||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
|||
* sell copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS |
|||
* IN THE SOFTWARE. |
|||
*/ |
|||
|
|||
|
|||
#include "os390-syscalls.h" |
|||
#include <errno.h> |
|||
#include <stdlib.h> |
|||
#include <assert.h> |
|||
#include <search.h> |
|||
|
|||
#define CW_CONDVAR 32 |
|||
|
|||
#pragma linkage(BPX4CTW, OS) |
|||
#pragma linkage(BPX1CTW, OS) |
|||
|
|||
static int number_of_epolls; |
|||
static QUEUE global_epoll_queue; |
|||
static uv_mutex_t global_epoll_lock; |
|||
static uv_once_t once = UV_ONCE_INIT; |
|||
|
|||
int scandir(const char* maindir, struct dirent*** namelist, |
|||
int (*filter)(const struct dirent*), |
|||
int (*compar)(const struct dirent**, |
|||
const struct dirent **)) { |
|||
struct dirent** nl; |
|||
struct dirent* dirent; |
|||
unsigned count; |
|||
size_t allocated; |
|||
DIR* mdir; |
|||
|
|||
nl = NULL; |
|||
count = 0; |
|||
allocated = 0; |
|||
mdir = opendir(maindir); |
|||
if (!mdir) |
|||
return -1; |
|||
|
|||
while (1) { |
|||
dirent = readdir(mdir); |
|||
if (!dirent) |
|||
break; |
|||
if (!filter || filter(dirent)) { |
|||
struct dirent* copy; |
|||
copy = uv__malloc(sizeof(*copy)); |
|||
if (!copy) { |
|||
while (count) { |
|||
dirent = nl[--count]; |
|||
uv__free(dirent); |
|||
} |
|||
uv__free(nl); |
|||
closedir(mdir); |
|||
errno = ENOMEM; |
|||
return -1; |
|||
} |
|||
memcpy(copy, dirent, sizeof(*copy)); |
|||
|
|||
nl = uv__realloc(nl, sizeof(*copy) * (count + 1)); |
|||
nl[count++] = copy; |
|||
} |
|||
} |
|||
|
|||
qsort(nl, count, sizeof(struct dirent *), |
|||
(int (*)(const void *, const void *)) compar); |
|||
|
|||
closedir(mdir); |
|||
|
|||
*namelist = nl; |
|||
return count; |
|||
} |
|||
|
|||
|
|||
static unsigned int next_power_of_two(unsigned int val) { |
|||
val -= 1; |
|||
val |= val >> 1; |
|||
val |= val >> 2; |
|||
val |= val >> 4; |
|||
val |= val >> 8; |
|||
val |= val >> 16; |
|||
val += 1; |
|||
return val; |
|||
} |
|||
|
|||
|
|||
static void maybe_resize(uv__os390_epoll* lst, unsigned int len) { |
|||
unsigned int newsize; |
|||
unsigned int i; |
|||
struct pollfd* newlst; |
|||
|
|||
if (len <= lst->size) |
|||
return; |
|||
|
|||
newsize = next_power_of_two(len); |
|||
newlst = uv__realloc(lst->items, newsize * sizeof(lst->items[0])); |
|||
|
|||
if (newlst == NULL) |
|||
abort(); |
|||
for (i = lst->size; i < newsize; ++i) |
|||
newlst[i].fd = -1; |
|||
|
|||
lst->items = newlst; |
|||
lst->size = newsize; |
|||
} |
|||
|
|||
|
|||
static void epoll_init() { |
|||
QUEUE_INIT(&global_epoll_queue); |
|||
if (uv_mutex_init(&global_epoll_lock)) |
|||
abort(); |
|||
} |
|||
|
|||
|
|||
uv__os390_epoll* epoll_create1(int flags) { |
|||
uv__os390_epoll* lst; |
|||
|
|||
uv_once(&once, epoll_init); |
|||
uv_mutex_lock(&global_epoll_lock); |
|||
lst = uv__malloc(sizeof(*lst)); |
|||
if (lst == -1) |
|||
return NULL; |
|||
QUEUE_INSERT_TAIL(&global_epoll_queue, &lst->member); |
|||
uv_mutex_unlock(&global_epoll_lock); |
|||
|
|||
/* initialize list */ |
|||
lst->size = 0; |
|||
lst->items = NULL; |
|||
return lst; |
|||
} |
|||
|
|||
|
|||
int epoll_ctl(uv__os390_epoll* lst, |
|||
int op, |
|||
int fd, |
|||
struct epoll_event *event) { |
|||
if(op == EPOLL_CTL_DEL) { |
|||
if (fd >= lst->size || lst->items[fd].fd == -1) { |
|||
errno = ENOENT; |
|||
return -1; |
|||
} |
|||
lst->items[fd].fd = -1; |
|||
} else if(op == EPOLL_CTL_ADD) { |
|||
maybe_resize(lst, fd + 1); |
|||
if (lst->items[fd].fd != -1) { |
|||
errno = EEXIST; |
|||
return -1; |
|||
} |
|||
lst->items[fd].fd = fd; |
|||
lst->items[fd].events = event->events; |
|||
} else if(op == EPOLL_CTL_MOD) { |
|||
if (fd >= lst->size || lst->items[fd].fd == -1) { |
|||
errno = ENOENT; |
|||
return -1; |
|||
} |
|||
lst->items[fd].events = event->events; |
|||
} else |
|||
abort(); |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
|
|||
int epoll_wait(uv__os390_epoll* lst, struct epoll_event* events, |
|||
int maxevents, int timeout) { |
|||
size_t size; |
|||
struct pollfd* pfds; |
|||
int pollret; |
|||
int reventcount; |
|||
|
|||
uv_mutex_lock(&global_epoll_lock); |
|||
uv_mutex_unlock(&global_epoll_lock); |
|||
size = lst->size; |
|||
pfds = lst->items; |
|||
pollret = poll(pfds, size, timeout); |
|||
if(pollret == -1) |
|||
return pollret; |
|||
|
|||
reventcount = 0; |
|||
for (int i = 0; i < lst->size && i < maxevents; ++i) { |
|||
struct epoll_event ev; |
|||
|
|||
ev.events = 0; |
|||
ev.fd = pfds[i].fd; |
|||
if(!pfds[i].revents) |
|||
continue; |
|||
|
|||
if(pfds[i].revents & POLLRDNORM) |
|||
ev.events = ev.events | POLLIN; |
|||
|
|||
if(pfds[i].revents & POLLWRNORM) |
|||
ev.events = ev.events | POLLOUT; |
|||
|
|||
if(pfds[i].revents & POLLHUP) |
|||
ev.events = ev.events | POLLHUP; |
|||
|
|||
pfds[i].revents = 0; |
|||
events[reventcount++] = ev; |
|||
} |
|||
|
|||
return reventcount; |
|||
} |
|||
|
|||
|
|||
int epoll_file_close(int fd) { |
|||
QUEUE* q; |
|||
|
|||
uv_once(&once, epoll_init); |
|||
uv_mutex_lock(&global_epoll_lock); |
|||
QUEUE_FOREACH(q, &global_epoll_queue) { |
|||
uv__os390_epoll* lst; |
|||
|
|||
lst = QUEUE_DATA(q, uv__os390_epoll, member); |
|||
if (fd < lst->size && lst->items != NULL && lst->items[fd].fd != -1) |
|||
lst->items[fd].fd = -1; |
|||
} |
|||
|
|||
uv_mutex_unlock(&global_epoll_lock); |
|||
return 0; |
|||
} |
|||
|
|||
void epoll_queue_close(uv__os390_epoll* lst) { |
|||
uv_mutex_lock(&global_epoll_lock); |
|||
QUEUE_REMOVE(&lst->member); |
|||
uv_mutex_unlock(&global_epoll_lock); |
|||
uv__free(lst->items); |
|||
lst->items = NULL; |
|||
} |
|||
|
|||
|
|||
int nanosleep(const struct timespec* req, struct timespec* rem) { |
|||
unsigned nano; |
|||
unsigned seconds; |
|||
unsigned events; |
|||
unsigned secrem; |
|||
unsigned nanorem; |
|||
int rv; |
|||
int rc; |
|||
int rsn; |
|||
|
|||
nano = (int)req->tv_nsec; |
|||
seconds = req->tv_sec; |
|||
events = CW_CONDVAR; |
|||
|
|||
#if defined(_LP64) |
|||
BPX4CTW(&seconds, &nano, &events, &secrem, &nanorem, &rv, &rc, &rsn); |
|||
#else |
|||
BPX1CTW(&seconds, &nano, &events, &secrem, &nanorem, &rv, &rc, &rsn); |
|||
#endif |
|||
|
|||
assert(rv == -1 && errno == EAGAIN); |
|||
|
|||
if(rem != NULL) { |
|||
rem->tv_nsec = nanorem; |
|||
rem->tv_sec = secrem; |
|||
} |
|||
|
|||
return 0; |
|||
} |
|||
|
|||
|
|||
char* mkdtemp(char* path) { |
|||
static const char* tempchars = |
|||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; |
|||
static const size_t num_chars = 62; |
|||
static const size_t num_x = 6; |
|||
char *ep, *cp; |
|||
unsigned int tries, i; |
|||
size_t len; |
|||
uint64_t v; |
|||
int fd; |
|||
int retval; |
|||
int saved_errno; |
|||
|
|||
len = strlen(path); |
|||
ep = path + len; |
|||
if (len < num_x || strncmp(ep - num_x, "XXXXXX", num_x)) { |
|||
errno = EINVAL; |
|||
return NULL; |
|||
} |
|||
|
|||
fd = open("/dev/urandom", O_RDONLY); |
|||
if (fd == -1) |
|||
return NULL; |
|||
|
|||
tries = TMP_MAX; |
|||
retval = -1; |
|||
do { |
|||
if (read(fd, &v, sizeof(v)) != sizeof(v)) |
|||
break; |
|||
|
|||
cp = ep - num_x; |
|||
for (i = 0; i < num_x; i++) { |
|||
*cp++ = tempchars[v % num_chars]; |
|||
v /= num_chars; |
|||
} |
|||
|
|||
if (mkdir(path, S_IRWXU) == 0) { |
|||
retval = 0; |
|||
break; |
|||
} |
|||
else if (errno != EEXIST) |
|||
break; |
|||
} while (--tries); |
|||
|
|||
saved_errno = errno; |
|||
uv__close(fd); |
|||
if (tries == 0) { |
|||
errno = EEXIST; |
|||
return NULL; |
|||
} |
|||
|
|||
if (retval == -1) { |
|||
errno = saved_errno; |
|||
return NULL; |
|||
} |
|||
|
|||
return path; |
|||
} |
|||
@ -0,0 +1,69 @@ |
|||
/* Copyright libuv project contributors. All rights reserved.
|
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to |
|||
* deal in the Software without restriction, including without limitation the |
|||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or |
|||
* sell copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS |
|||
* IN THE SOFTWARE. |
|||
*/ |
|||
|
|||
|
|||
#ifndef UV_OS390_SYSCALL_H_ |
|||
#define UV_OS390_SYSCALL_H_ |
|||
|
|||
#include "uv.h" |
|||
#include "internal.h" |
|||
#include <dirent.h> |
|||
#include <poll.h> |
|||
#include <pthread.h> |
|||
|
|||
#define EPOLL_CTL_ADD 1 |
|||
#define EPOLL_CTL_DEL 2 |
|||
#define EPOLL_CTL_MOD 3 |
|||
#define MAX_EPOLL_INSTANCES 256 |
|||
#define MAX_ITEMS_PER_EPOLL 1024 |
|||
|
|||
#define UV__O_CLOEXEC 0x80000 |
|||
#define UV__EPOLL_CLOEXEC UV__O_CLOEXEC |
|||
#define UV__EPOLL_CTL_ADD EPOLL_CTL_ADD |
|||
#define UV__EPOLL_CTL_DEL EPOLL_CTL_DEL |
|||
#define UV__EPOLL_CTL_MOD EPOLL_CTL_MOD |
|||
|
|||
struct epoll_event { |
|||
int events; |
|||
int fd; |
|||
}; |
|||
|
|||
typedef struct { |
|||
QUEUE member; |
|||
struct pollfd* items; |
|||
unsigned long size; |
|||
} uv__os390_epoll; |
|||
|
|||
/* epoll api */ |
|||
uv__os390_epoll* epoll_create1(int flags); |
|||
int epoll_ctl(uv__os390_epoll* ep, int op, int fd, struct epoll_event *event); |
|||
int epoll_wait(uv__os390_epoll* ep, struct epoll_event *events, int maxevents, int timeout); |
|||
int epoll_file_close(int fd); |
|||
|
|||
/* utility functions */ |
|||
int nanosleep(const struct timespec* req, struct timespec* rem); |
|||
int scandir(const char* maindir, struct dirent*** namelist, |
|||
int (*filter)(const struct dirent *), |
|||
int (*compar)(const struct dirent **, |
|||
const struct dirent **)); |
|||
char *mkdtemp(char* path); |
|||
|
|||
#endif /* UV_OS390_SYSCALL_H_ */ |
|||
Loading…
Reference in new issue