change back header-only bson

mongodb · Aug 3, 2010 · c8ae18d · c8ae18d
1 parent 4cb2fac
commit c8ae18d
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 43 deletions.
diff --git a/bson/bson.cpp b/bson/bson.cpp
diff --git a/bson/bsondemo/bsondemo.vcxproj b/bson/bsondemo/bsondemo.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -170,7 +170,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\bson.cpp" />
     <ClCompile Include="bsondemo.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -191,4 +190,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/bson/bsondemo/bsondemo.vcxproj.filters b/bson/bsondemo/bsondemo.vcxproj.filters
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="bsondemo.cpp" />
-    <ClCompile Include="..\bson.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\ordering.h">
@@ -50,4 +49,4 @@
       <UniqueIdentifier>{ea599740-3c6f-40dd-a121-e825d82ae4aa}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/bson/inline_decls.h b/bson/inline_decls.h
@@ -0,0 +1,33 @@
+// inline.h
+
+/**
+*    Copyright (C) 2010 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,
+*    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
+
+#if defined(__GNUC__)
+
+#define NOINLINE_DECL __attribute__((noinline))
+
+#elif defined(_MSC_VER)
+
+#define NOINLINE_DECL __declspec(noinline)
+
+#else 
+
+#define NOINLINE_DECL
+
+#endif
diff --git a/bson/util/builder.h b/bson/util/builder.h
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <boost/shared_ptr.hpp>
+
+#include "../inline_decls.h"
 #include "../stringdata.h"
 
 namespace mongo {
@@ -130,7 +132,17 @@ namespace mongo {
 
     private:
         /* "slow" portion of 'grow()'  */
-        void grow_reallocate(); 
+        void NOINLINE_DECL grow_reallocate(){
+            int a = size * 2;
+            if ( a == 0 )
+                a = 512;
+            if ( l > a )
+                a = l + 16 * 1024;
+            if( a > 64 * 1024 * 1024 )
+                msgasserted(10000, "BufBuilder grow() > 64MB");
+            data = (char *) realloc(data, a);
+            size= a;
+        }
 
         char *data;
         int l;

diff --git a/db/jsobj.cpp b/db/jsobj.cpp
@@ -40,8 +40,6 @@ BOOST_STATIC_ASSERT( sizeof(double) == 8 );
 BOOST_STATIC_ASSERT( sizeof(mongo::Date_t) == 8 );
 BOOST_STATIC_ASSERT( sizeof(mongo::OID) == 12 );
 
-#include "../bson/bson.cpp"
-
 namespace mongo {
 
     BSONElement nullElement;