mirror of
https://github.com/mongodb/mongo.git
synced 2024-11-30 00:56:44 +01:00
Merge branch 'master' of git@github.com:mongodb/mongo
This commit is contained in:
commit
3369fd5b76
15
README
15
README
@ -28,10 +28,11 @@ BUILDING
|
||||
$ cd ..
|
||||
$ svn co http://svn.red-bean.com/unittest/trunk/ unittest
|
||||
$ cd unittest
|
||||
$ ./configure
|
||||
$ make
|
||||
$ sudo make install
|
||||
|
||||
- Then use scons to build.
|
||||
- Then use scons to build.
|
||||
|
||||
If you want to build everything (mongod, mongo, tools, etc):
|
||||
|
||||
@ -52,14 +53,14 @@ of GCC may not be happy.
|
||||
|
||||
NOTES
|
||||
|
||||
Mongo uses the 10gen appserver and the Java Virtual Machine to execute
|
||||
user program code in the database. This feature is optional -- if you would
|
||||
like to run the database without these installed, run with the --nojni
|
||||
option. With --nojni specified, the db.eval() and $where features are no
|
||||
Mongo uses the 10gen appserver and the Java Virtual Machine to execute
|
||||
user program code in the database. This feature is optional -- if you would
|
||||
like to run the database without these installed, run with the --nojni
|
||||
option. With --nojni specified, the db.eval() and $where features are no
|
||||
longer available. You may still need JVM libraries which are statically linked.
|
||||
|
||||
Mongo uses memory mapped files. If built as a 32 bit executable, you will
|
||||
not be able to work with large (multi-gigabyte) databases. However, 32 bit
|
||||
Mongo uses memory mapped files. If built as a 32 bit executable, you will
|
||||
not be able to work with large (multi-gigabyte) databases. However, 32 bit
|
||||
builds work fine with small development databases.
|
||||
|
||||
--- WINDOWS ---
|
||||
|
20
db/db.cpp
20
db/db.cpp
@ -344,6 +344,17 @@ namespace mongo {
|
||||
}
|
||||
|
||||
void _initAndListen(int listenPort, const char *appserverLoc = null) {
|
||||
|
||||
#if !defined(_WIN32)
|
||||
pid_t pid = 0;
|
||||
pid = getpid();
|
||||
#else
|
||||
int pid=0;
|
||||
#endif
|
||||
|
||||
log() << "Mongo DB : starting : pid = " << pid << " port = " << port << " dbpath = " << dbpath
|
||||
<< " master = " << master << " slave = " << slave << endl;
|
||||
|
||||
stringstream ss;
|
||||
ss << "dbpath (" << dbpath << ") does not exist";
|
||||
massert( ss.str().c_str(), boost::filesystem::exists( dbpath ) );
|
||||
@ -365,15 +376,6 @@ namespace mongo {
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !defined(_WIN32)
|
||||
pid_t pid = 0;
|
||||
pid = getpid();
|
||||
#else
|
||||
int pid=0;
|
||||
#endif
|
||||
|
||||
log() << "Mongo DB : starting : pid = " << pid << " port = " << port << " dbpath = " << dbpath
|
||||
<< " master = " << master << " slave = " << slave << endl;
|
||||
|
||||
#if !defined(NOJNI)
|
||||
if ( useJNI ) {
|
||||
|
Loading…
Reference in New Issue
Block a user