Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Frank Celler 2014-12-23 23:44:24 +01:00
parent f34aabe87a 6c7a51127f
commit 331314be97
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -103,7 +103,14 @@ endif ()
math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}") math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
add_definitions("-DTRI_BITS=${BITS}") add_definitions("-DTRI_BITS=${BITS}")
add_definitions("-DTRI_ENABLE_CLUSTER=1")
################################################################################
### @brief raspberry pi
################################################################################
if (BUILD_PACKAGE STREQUAL "raspbian")
add_definitions("-DTRI_FORCE_ARMV6")
endif ()
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- OPTIONS ## --SECTION-- OPTIONS

5
arangod/V8Server/ApplicationV8.cpp
View File

@ -1037,6 +1037,11 @@ bool ApplicationV8::prepare () {
v8::V8::SetFlagsFromString(_v8Options.c_str(), (int) _v8Options.size()); v8::V8::SetFlagsFromString(_v8Options.c_str(), (int) _v8Options.size());
} }
#ifdef TRI_FORCE_ARMV6
const string forceARMv6 = "--noenable-armv7";
v8::V8::SetFlagsFromString(forceARMv6.c_str(), (int) forceARMv6.size());
#endif
// use a minimum of 1 second for GC // use a minimum of 1 second for GC
if (_gcFrequency < 1) { if (_gcFrequency < 1) {
_gcFrequency = 1; _gcFrequency = 1;

9
arangosh/Makefile.files
View File

@ -15,8 +15,7 @@ bin_arangob_CPPFLAGS = \
bin_arangob_LDADD = \ bin_arangob_LDADD = \
lib/libarango_client.a \ lib/libarango_client.a \
lib/libarango.a \ lib/libarango.a \
$(LIBS) \ $(LIBS)
@V8_LIBS@
bin_arangob_SOURCES = \ bin_arangob_SOURCES = \
arangosh/ArangoShell/ArangoClient.cpp \ arangosh/ArangoShell/ArangoClient.cpp \
@ -33,8 +32,7 @@ bin_arangodump_CPPFLAGS = \
bin_arangodump_LDADD = \ bin_arangodump_LDADD = \
lib/libarango_client.a \ lib/libarango_client.a \
lib/libarango.a \ lib/libarango.a \
$(LIBS) \ $(LIBS)
@V8_LIBS@
bin_arangodump_SOURCES = \ bin_arangodump_SOURCES = \
arangosh/ArangoShell/ArangoClient.cpp \ arangosh/ArangoShell/ArangoClient.cpp \
@ -72,8 +70,7 @@ bin_arangorestore_CPPFLAGS = \
bin_arangorestore_LDADD = \ bin_arangorestore_LDADD = \
lib/libarango_client.a \ lib/libarango_client.a \
lib/libarango.a \ lib/libarango.a \
$(LIBS) \ $(LIBS)
@V8_LIBS@
bin_arangorestore_SOURCES = \ bin_arangorestore_SOURCES = \
arangosh/ArangoShell/ArangoClient.cpp \ arangosh/ArangoShell/ArangoClient.cpp \

10
arangosh/V8Client/arangosh.cpp
View File

@ -2348,9 +2348,7 @@ int main (int argc, char* args[]) {
// ............................................................................. // .............................................................................
v8::V8::InitializeICU(); v8::V8::InitializeICU();
v8::Platform* platform = v8::platform::CreateDefaultPlatform();
v8::V8::InitializePlatform(platform);
// set V8 options // set V8 options
if (! V8Options.empty()) { if (! V8Options.empty()) {
// explicit option --javascript.v8-options used // explicit option --javascript.v8-options used
@ -2361,6 +2359,14 @@ int main (int argc, char* args[]) {
v8::V8::SetFlagsFromCommandLine(&argc, args, true); v8::V8::SetFlagsFromCommandLine(&argc, args, true);
} }
#ifdef TRI_FORCE_ARMV6
const string forceARMv6 = "--noenable-armv7";
v8::V8::SetFlagsFromString(forceARMv6.c_str(), (int) forceARMv6.size());
#endif
v8::Platform* platform = v8::platform::CreateDefaultPlatform();
v8::V8::InitializePlatform(platform);
BufferAllocator bufferAllocator; BufferAllocator bufferAllocator;
v8::V8::SetArrayBufferAllocator(&bufferAllocator); v8::V8::SetArrayBufferAllocator(&bufferAllocator);