mirror of https://github.com/nodejs/node.git
Remove support for cygwin
parent
9d27faa2c4
commit
67b235735e
|
@ -1,346 +0,0 @@
|
|||
// Copyright Joyent, Inc. and other Node contributors.
|
||||
//
|
||||
// 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 "node.h"
|
||||
#include "platform.h"
|
||||
|
||||
#include <v8.h>
|
||||
|
||||
#include <sys/param.h> // for MAXPATHLEN
|
||||
#include <sys/sysinfo.h>
|
||||
#include <unistd.h> // getpagesize, sysconf
|
||||
#include <stdio.h> // sscanf, snprintf
|
||||
#include <string.h>
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
|
||||
namespace node {
|
||||
|
||||
using namespace v8;
|
||||
|
||||
static char buf[MAXPATHLEN + 1];
|
||||
static char *process_title = NULL;
|
||||
double Platform::prog_start_time = Platform::GetUptime();
|
||||
|
||||
// Does the about the same as perror(), but for windows api functions
|
||||
static void _winapi_perror(const char* prefix = NULL) {
|
||||
DWORD errorno = GetLastError();
|
||||
char *errmsg;
|
||||
|
||||
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||
NULL, errorno, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&errmsg, 0, NULL);
|
||||
|
||||
// FormatMessage messages include a newline character
|
||||
|
||||
if (prefix) {
|
||||
fprintf(stderr, "%s: %s", prefix, errmsg);
|
||||
} else {
|
||||
fputs(errmsg, stderr);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
char** Platform::SetupArgs(int argc, char *argv[]) {
|
||||
return argv;
|
||||
}
|
||||
|
||||
|
||||
// Max title length; the only thing MSDN tells us about the maximum length
|
||||
// of the console title is that it is smaller than 64K. However in practice
|
||||
// it is much smaller, and there is no way to figure out what the exact length
|
||||
// of the title is or can be, at least not on XP. To make it even more
|
||||
// annoying, GetConsoleTitle failes when the buffer to be read into is bigger
|
||||
// than the actual maximum length. So we make a conservative guess here;
|
||||
// just don't put the novel you're writing in the title, unless the plot
|
||||
// survives truncation.
|
||||
#define MAX_TITLE_LENGTH 8192
|
||||
|
||||
void Platform::SetProcessTitle(char *title) {
|
||||
// We need to convert _title_ to UTF-16 first, because that's what windows uses internally.
|
||||
// It would be more efficient to use the UTF-16 value that we can obtain from v8,
|
||||
// but it's not accessible from here.
|
||||
|
||||
int length;
|
||||
WCHAR *title_w;
|
||||
|
||||
// Find out how big the buffer for the wide-char title must be
|
||||
length = MultiByteToWideChar(CP_UTF8, 0, title, -1, NULL, 0);
|
||||
if (!length) {
|
||||
_winapi_perror("MultiByteToWideChar");
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert to wide-char string
|
||||
title_w = new WCHAR[length];
|
||||
length = MultiByteToWideChar(CP_UTF8, 0, title, -1, title_w, length);
|
||||
if (!length) {
|
||||
_winapi_perror("MultiByteToWideChar");
|
||||
delete[] title_w;
|
||||
return;
|
||||
};
|
||||
|
||||
// If the title must be truncated insert a \0 terminator there
|
||||
if (length > MAX_TITLE_LENGTH) {
|
||||
title_w[MAX_TITLE_LENGTH - 1] = *L"\0";
|
||||
}
|
||||
|
||||
if (!SetConsoleTitleW(title_w)) {
|
||||
_winapi_perror("SetConsoleTitleW");
|
||||
}
|
||||
|
||||
free(process_title);
|
||||
process_title = strdup(title);
|
||||
|
||||
delete[] title_w;
|
||||
}
|
||||
|
||||
|
||||
static inline char* _getProcessTitle() {
|
||||
WCHAR title_w[MAX_TITLE_LENGTH];
|
||||
char *title;
|
||||
int result, length;
|
||||
|
||||
result = GetConsoleTitleW(title_w, sizeof(title_w) / sizeof(WCHAR));
|
||||
|
||||
if (result == 0) {
|
||||
_winapi_perror("GetConsoleTitleW");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Find out what the size of the buffer is that we need
|
||||
length = WideCharToMultiByte(CP_UTF8, 0, title_w, -1, NULL, 0, NULL, NULL);
|
||||
if (!length) {
|
||||
_winapi_perror("WideCharToMultiByte");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
title = (char *) malloc(length);
|
||||
if (!title) {
|
||||
perror("malloc");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Do utf16 -> utf8 conversion here
|
||||
if (!WideCharToMultiByte(CP_UTF8, 0, title_w, -1, title, length, NULL, NULL)) {
|
||||
_winapi_perror("WideCharToMultiByte");
|
||||
free(title);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return title;
|
||||
}
|
||||
|
||||
|
||||
const char* Platform::GetProcessTitle(int *len) {
|
||||
// If the process_title was never read before nor explicitly set,
|
||||
// we must query it with getConsoleTitleW
|
||||
if (!process_title) {
|
||||
process_title = _getProcessTitle();
|
||||
}
|
||||
|
||||
if (process_title) {
|
||||
*len = strlen(process_title);
|
||||
return process_title;
|
||||
} else {
|
||||
*len = 0;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int Platform::GetMemory(size_t *rss) {
|
||||
FILE *f = fopen("/proc/self/stat", "r");
|
||||
if (!f) return -1;
|
||||
|
||||
int itmp;
|
||||
char ctmp;
|
||||
size_t page_size = getpagesize();
|
||||
|
||||
/* PID */
|
||||
if (fscanf(f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Exec file */
|
||||
if (fscanf (f, "%s ", buf) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* State */
|
||||
if (fscanf (f, "%c ", &ctmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Parent process */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Process group */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Session id */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* TTY */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* TTY owner process group */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Flags */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Minor faults (no memory page) */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Minor faults, children */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Major faults (memory page faults) */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Major faults, children */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* utime */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* stime */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* utime, children */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* stime, children */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* jiffies remaining in current time slice */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* 'nice' value */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* jiffies until next timeout */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* jiffies until next SIGALRM */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* start time (jiffies since system boot) */
|
||||
if (fscanf (f, "%d ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
|
||||
/* Virtual memory size */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
|
||||
/* Resident set size */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
*rss = (size_t) itmp * page_size;
|
||||
|
||||
/* rlim */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Start of text */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* End of text */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
/* Start of stack */
|
||||
if (fscanf (f, "%u ", &itmp) == 0) goto error; /* coverity[secure_coding] */
|
||||
|
||||
fclose (f);
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
fclose (f);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int Platform::GetCPUInfo(Local<Array> *cpus) {
|
||||
HandleScope scope;
|
||||
Local<Object> cpuinfo;
|
||||
Local<Object> cputimes;
|
||||
unsigned int ticks = (unsigned int)sysconf(_SC_CLK_TCK),
|
||||
multiplier = ((uint64_t)1000L / ticks), cpuspeed;
|
||||
int numcpus = 0, i = 0;
|
||||
unsigned long long ticks_user, ticks_sys, ticks_idle, ticks_nice, ticks_intr;
|
||||
char line[512], speedPath[256], model[512];
|
||||
FILE *fpStat = fopen("/proc/stat", "r");
|
||||
FILE *fpModel = fopen("/proc/cpuinfo", "r");
|
||||
FILE *fpSpeed;
|
||||
|
||||
if (fpModel) {
|
||||
while (fgets(line, 511, fpModel) != NULL) {
|
||||
if (strncmp(line, "model name", 10) == 0) {
|
||||
numcpus++;
|
||||
if (numcpus == 1) {
|
||||
char *p = strchr(line, ':') + 2;
|
||||
strcpy(model, p);
|
||||
model[strlen(model)-1] = 0;
|
||||
}
|
||||
} else if (strncmp(line, "cpu MHz", 7) == 0) {
|
||||
if (numcpus == 1) {
|
||||
sscanf(line, "%*s %*s : %u", &cpuspeed);
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose(fpModel);
|
||||
}
|
||||
|
||||
*cpus = Array::New(numcpus);
|
||||
|
||||
if (fpStat) {
|
||||
while (fgets(line, 511, fpStat) != NULL) {
|
||||
if (strncmp(line, "cpu ", 4) == 0) {
|
||||
continue;
|
||||
} else if (strncmp(line, "cpu", 3) != 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
sscanf(line, "%*s %llu %llu %llu %llu",
|
||||
&ticks_user, &ticks_nice, &ticks_sys, &ticks_idle);
|
||||
snprintf(speedPath, sizeof(speedPath),
|
||||
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_max_freq", i);
|
||||
|
||||
fpSpeed = fopen(speedPath, "r");
|
||||
if (fpSpeed) {
|
||||
if (fgets(line, 511, fpSpeed) != NULL) {
|
||||
sscanf(line, "%u", &cpuspeed);
|
||||
cpuspeed /= 1000;
|
||||
}
|
||||
fclose(fpSpeed);
|
||||
}
|
||||
cpuinfo = Object::New();
|
||||
cputimes = Object::New();
|
||||
cputimes->Set(String::New("user"), Number::New(ticks_user * multiplier));
|
||||
cputimes->Set(String::New("nice"), Number::New(ticks_nice * multiplier));
|
||||
cputimes->Set(String::New("sys"), Number::New(ticks_sys * multiplier));
|
||||
cputimes->Set(String::New("idle"), Number::New(ticks_idle * multiplier));
|
||||
cputimes->Set(String::New("irq"), Number::New(0));
|
||||
|
||||
cpuinfo->Set(String::New("model"), String::New(model));
|
||||
cpuinfo->Set(String::New("speed"), Number::New(cpuspeed));
|
||||
|
||||
cpuinfo->Set(String::New("times"), cputimes);
|
||||
(*cpus)->Set(i++, cpuinfo);
|
||||
}
|
||||
fclose(fpStat);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
double Platform::GetUptimeImpl() {
|
||||
double amount;
|
||||
char line[512];
|
||||
FILE *fpUptime = fopen("/proc/uptime", "r");
|
||||
|
||||
amount = 0;
|
||||
|
||||
if (fpUptime) {
|
||||
if (fgets(line, 511, fpUptime) != NULL) {
|
||||
sscanf(line, "%lf %*lf", &amount);
|
||||
}
|
||||
fclose(fpUptime);
|
||||
}
|
||||
|
||||
return amount;
|
||||
}
|
||||
|
||||
Handle<Value> Platform::GetInterfaceAddresses() {
|
||||
HandleScope scope;
|
||||
return scope.Close(Object::New());
|
||||
}
|
||||
|
||||
|
||||
} // namespace node
|
|
@ -147,7 +147,7 @@ class ProcessWrap : public HandleWrap {
|
|||
}
|
||||
|
||||
// options.windows_verbatim_arguments
|
||||
#if defined(_WIN32) && !defined(__CYGWIN__)
|
||||
#if defined(_WIN32)
|
||||
options.windows_verbatim_arguments = js_options->
|
||||
Get(String::NewSymbol("windowsVerbatimArguments"))->IsTrue();
|
||||
#endif
|
||||
|
|
16
wscript
16
wscript
|
@ -37,6 +37,10 @@ APPNAME="node.js"
|
|||
sys.path.append(sys.argv[0] + '/tools');
|
||||
import js2c
|
||||
|
||||
if sys.platform.startswith("cygwin"):
|
||||
print "cygwin not supported"
|
||||
sys.exit(1)
|
||||
|
||||
srcdir = '.'
|
||||
blddir = 'out'
|
||||
supported_archs = ('arm', 'ia32', 'x64') # 'mips' supported by v8, but not node
|
||||
|
@ -260,7 +264,7 @@ def configure(conf):
|
|||
conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib'
|
||||
|
||||
conf.env["USE_DEBUG"] = o.debug
|
||||
# Snapshot building does noet seem to work on cygwin and mingw32
|
||||
# Snapshot building does noet seem to work on mingw32
|
||||
conf.env["SNAPSHOT_V8"] = not o.without_snapshot and not sys.platform.startswith("win32")
|
||||
if sys.platform.startswith("sunos"):
|
||||
conf.env["SNAPSHOT_V8"] = False
|
||||
|
@ -276,7 +280,7 @@ def configure(conf):
|
|||
conf.env.append_value("LINKFLAGS", "-lz")
|
||||
|
||||
conf.check(lib='dl', uselib_store='DL')
|
||||
if not sys.platform.startswith("sunos") and not sys.platform.startswith("cygwin") and not sys.platform.startswith("win32"):
|
||||
if not sys.platform.startswith("sunos") and not sys.platform.startswith("win32"):
|
||||
conf.env.append_value("CCFLAGS", "-rdynamic")
|
||||
conf.env.append_value("LINKFLAGS_DL", "-rdynamic")
|
||||
|
||||
|
@ -440,7 +444,7 @@ def configure(conf):
|
|||
conf.env.append_value ('CCFLAGS', '-threads')
|
||||
conf.env.append_value ('CXXFLAGS', '-threads')
|
||||
#conf.env.append_value ('LINKFLAGS', ' -threads')
|
||||
elif not sys.platform.startswith("cygwin") and not sys.platform.startswith("win32"):
|
||||
elif not sys.platform.startswith("win32"):
|
||||
threadflags='-pthread'
|
||||
conf.env.append_value ('CCFLAGS', threadflags)
|
||||
conf.env.append_value ('CXXFLAGS', threadflags)
|
||||
|
@ -923,12 +927,6 @@ def build(bld):
|
|||
if os.environ.has_key('RPATH'):
|
||||
node.rpath = os.environ['RPATH']
|
||||
|
||||
if sys.platform.startswith('cygwin'):
|
||||
bld.env.append_value('LINKFLAGS', '-Wl,--export-all-symbols')
|
||||
bld.env.append_value('LINKFLAGS', '-Wl,--out-implib,default/libnode.dll.a')
|
||||
bld.env.append_value('LINKFLAGS', '-Wl,--output-def,default/libnode.def')
|
||||
bld.install_files('${LIBDIR}', "out/Release/libnode.*")
|
||||
|
||||
if (sys.platform.startswith("win32")):
|
||||
# Static libgcc
|
||||
bld.env.append_value('LINKFLAGS', '-static-libgcc')
|
||||
|
|
Loading…
Reference in New Issue