diff options
author | Dwight <dwight@10gen.com> | 2010-05-17 17:11:48 -0400 |
---|---|---|
committer | Dwight <dwight@10gen.com> | 2010-05-17 17:11:48 -0400 |
commit | ce35c184a88e3011459c6ce06bd3d5c22a0d03dc (patch) | |
tree | 9024625e3617132dc0b100bd3f9037927b979c0d | |
parent | 002abac76787f5ff6cf1ca95b7f6116459be773c (diff) | |
download | mongo-ce35c184a88e3011459c6ce06bd3d5c22a0d03dc.tar.gz |
new files
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | db/db.vcxproj | 2 | ||||
-rwxr-xr-x | db/db.vcxproj.filters | 6 | ||||
-rw-r--r-- | dbtests/test.vcxproj | 2 | ||||
-rwxr-xr-x | dbtests/test.vcxproj.filters | 6 | ||||
-rw-r--r-- | util/concurrency/task.cpp | 24 | ||||
-rw-r--r-- | util/concurrency/task.h | 24 | ||||
-rw-r--r-- | util/concurrency/vars.cpp | 2 |
8 files changed, 65 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 5d9a5f6d4f0..39352aabe58 100644 --- a/SConstruct +++ b/SConstruct @@ -386,7 +386,7 @@ if GetOption( "extralib" ) is not None: commonFiles = Split( "pch.cpp buildinfo.cpp db/common.cpp db/jsobj.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp shell/mongo.cpp" ) commonFiles += [ "util/background.cpp" , "util/mmap.cpp" , "util/ramstore.cpp", "util/sock.cpp" , "util/util.cpp" , "util/message.cpp" , - "util/assert_util.cpp" , "util/httpclient.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/debug_util.cpp", + "util/assert_util.cpp" , "util/httpclient.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/concurrency/task.cpp", "util/debug_util.cpp", "util/thread_pool.cpp", "util/password.cpp" ] commonFiles += Glob( "util/*.c" ) commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp" ) diff --git a/db/db.vcxproj b/db/db.vcxproj index 817fc23f59e..35ae8b4b5ff 100644 --- a/db/db.vcxproj +++ b/db/db.vcxproj @@ -436,6 +436,7 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="..\util\concurrency\task.cpp" />
<ClCompile Include="..\util\concurrency\vars.cpp" />
<ClCompile Include="oplog.cpp" />
<ClCompile Include="repl.cpp" />
@@ -564,6 +565,7 @@ <ClInclude Include="..\targetver.h" />
<ClInclude Include="..\pcre-7.4\config.h" />
<ClInclude Include="..\pcre-7.4\pcre.h" />
+ <ClInclude Include="..\util\concurrency\task.h" />
<ClInclude Include="..\util\mongoutils\html.h" />
<ClInclude Include="..\util\mongoutils\str.h" />
<ClInclude Include="..\util\ramlog.h" />
diff --git a/db/db.vcxproj.filters b/db/db.vcxproj.filters index a4d462872c9..9d3c30a8dfa 100755 --- a/db/db.vcxproj.filters +++ b/db/db.vcxproj.filters @@ -320,6 +320,9 @@ <ClCompile Include="..\util\concurrency\vars.cpp">
<Filter>util\concurrency</Filter>
</ClCompile>
+ <ClCompile Include="..\util\concurrency\task.cpp">
+ <Filter>util\concurrency</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="client.h">
@@ -668,6 +671,9 @@ <ClInclude Include="..\client\parallel.h">
<Filter>client</Filter>
</ClInclude>
+ <ClInclude Include="..\util\concurrency\task.h">
+ <Filter>util\concurrency</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="libs">
diff --git a/dbtests/test.vcxproj b/dbtests/test.vcxproj index fc9a6365477..e7506292e29 100644 --- a/dbtests/test.vcxproj +++ b/dbtests/test.vcxproj @@ -237,6 +237,7 @@ <ClInclude Include="..\db\security.h" />
<ClInclude Include="..\util\builder.h" />
<ClInclude Include="..\util\concurrency\list.h" />
+ <ClInclude Include="..\util\concurrency\task.h" />
<ClInclude Include="..\util\concurrency\value.h" />
<ClInclude Include="..\util\file.h" />
<ClInclude Include="..\util\goodies.h" />
@@ -532,6 +533,7 @@ <ClCompile Include="..\db\json.cpp" />
<ClCompile Include="..\db\lasterror.cpp" />
<ClCompile Include="..\db\matcher.cpp" />
+ <ClCompile Include="..\util\concurrency\task.cpp" />
<ClCompile Include="..\util\concurrency\vars.cpp" />
<ClCompile Include="..\util\mmap_win.cpp" />
<ClCompile Include="..\db\namespace.cpp" />
diff --git a/dbtests/test.vcxproj.filters b/dbtests/test.vcxproj.filters index 525cfa0e744..a9d6aeb2915 100755 --- a/dbtests/test.vcxproj.filters +++ b/dbtests/test.vcxproj.filters @@ -232,6 +232,9 @@ <ClInclude Include="..\util\concurrency\value.h">
<Filter>util\concurrency</Filter>
</ClInclude>
+ <ClInclude Include="..\util\concurrency\task.h">
+ <Filter>util\concurrency</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\db\db.rc">
@@ -613,6 +616,9 @@ <ClCompile Include="..\util\concurrency\vars.cpp">
<Filter>util\concurrency</Filter>
</ClCompile>
+ <ClCompile Include="..\util\concurrency\task.cpp">
+ <Filter>util\concurrency</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\SConstruct">
diff --git a/util/concurrency/task.cpp b/util/concurrency/task.cpp new file mode 100644 index 00000000000..88043545615 --- /dev/null +++ b/util/concurrency/task.cpp @@ -0,0 +1,24 @@ +// @file task.cpp + +/** +* Copyright (C) 2008 10gen Inc. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful,b +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "pch.h" +#include "task.h" + +namespace mongo { + +} diff --git a/util/concurrency/task.h b/util/concurrency/task.h new file mode 100644 index 00000000000..89a2fcd6f41 --- /dev/null +++ b/util/concurrency/task.h @@ -0,0 +1,24 @@ +// @file task.h + +/** +* Copyright (C) 2008 10gen Inc. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License, version 3, +* as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful,b +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +namespace mongo { + + +} diff --git a/util/concurrency/vars.cpp b/util/concurrency/vars.cpp index 9c657bef8fc..046f611aeda 100644 --- a/util/concurrency/vars.cpp +++ b/util/concurrency/vars.cpp @@ -16,8 +16,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#pragma once - #include "pch.h" #include "value.h" |