diff --git a/config-unix.mk b/config-unix.mk index b976828c16..adbee4f4eb 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -134,13 +134,6 @@ OBJS += src/unix/openbsd.o OBJS += src/unix/kqueue.o endif -ifneq (,$(findstring cygwin,$(PLATFORM))) -# We drop the --std=c89, it hides CLOCK_MONOTONIC on cygwin -CSTDFLAG = -D_GNU_SOURCE -LDFLAGS+= -OBJS += src/unix/cygwin.o -endif - ifeq (sunos,$(PLATFORM)) RUNNER_LDFLAGS += -pthreads else diff --git a/include/uv.h b/include/uv.h index d9acb6acf5..5507eb0ff3 100644 --- a/include/uv.h +++ b/include/uv.h @@ -1755,9 +1755,9 @@ UV_EXTERN int uv_signal_stop(uv_signal_t* handle); /* - * Gets load avg + * Gets load average. * See: http://en.wikipedia.org/wiki/Load_(computing) - * (Returns [0,0,0] for windows and cygwin) + * Returns [0,0,0] on Windows. */ UV_EXTERN void uv_loadavg(double avg[3]); diff --git a/src/unix/cygwin.c b/src/unix/cygwin.c deleted file mode 100644 index dcd9d6ddb8..0000000000 --- a/src/unix/cygwin.c +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright Joyent, Inc. and other Node 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 "uv.h" -#include "internal.h" - -#include -#include -#include -#include -#include -#include - -#undef NANOSEC -#define NANOSEC ((uint64_t) 1e9) - - -int uv__platform_loop_init(uv_loop_t* loop, int default_loop) { - return 0; -} - - -void uv__platform_loop_delete(uv_loop_t* loop) { -} - - -uint64_t uv__hrtime(void) { - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); -} - - -void uv_loadavg(double avg[3]) { - /* Unsupported as of cygwin 1.7.7 */ - avg[0] = avg[1] = avg[2] = 0; -} - - -int uv_exepath(char* buffer, size_t* size) { - if (!buffer || !size) { - return -1; - } - - *size = readlink("/proc/self/exe", buffer, *size - 1); - if (*size <= 0) return -1; - buffer[*size] = '\0'; - return 0; -} - -uint64_t uv_get_free_memory(void) { - return (uint64_t) sysconf(_SC_PAGESIZE) * sysconf(_SC_AVPHYS_PAGES); -} - -uint64_t uv_get_total_memory(void) { - return (uint64_t) sysconf(_SC_PAGESIZE) * sysconf(_SC_PHYS_PAGES); -} - -int uv_fs_event_init(uv_loop_t* loop, - uv_fs_event_t* handle, - const char* filename, - uv_fs_event_cb cb, - int flags) { - uv__set_sys_error(loop, ENOSYS); - return -1; -} - - -void uv__fs_event_close(uv_fs_event_t* handle) { - assert(0 && "implement me"); -}