orifs · tomasbrod · Jan 17, 2014 · Jan 19, 2014 · Jan 20, 2014 · Jan 20, 2014
diff --git a/AUTHORS b/AUTHORS
@@ -1,3 +1,5 @@
 Ali Mashtizadeh <mashti@cs.stanford.edu>
 Frank Huang <fyhuang@stanford.edu>
 Daniel Jackoway <danjdel@gmail.com>
+Philip Zhuang <pzhuang@stanford.edu>
+Yinglei Wang <yw437@cornell.edu>
diff --git a/README b/README
@@ -19,14 +19,14 @@ Build Dependencies:
  - pkg-config
 
 Dependences:
+ - C++11 (Required)
  - openssl (tested with 1.0.1+) (Required)
- - boost headers (tested with 1.48+) (Required)
  - libevent 2.0 (Required)
  - FUSE (API Version 26+)
  - liblzma (for LZMA compression)
  - mDNSResponder (for Multipull Support)
  - libexecinfo (FreeBSD only)
- - libxml2 (S3 Backup)
+ - libedit (oridbg only)
 
 Build flags can be added to 'Local.sc' in the root directory, or through the 
 command line.  The available options can be displayed by typing 'scons --help'.  

diff --git a/SConstruct b/SConstruct
@@ -28,10 +28,12 @@ def CheckPkgMinVersion(context, name, version):
 opts = Variables('Local.sc')
 
 opts.AddVariables(
-    ("CC", "C Compiler"),
-    ("CXX", "C++ Compiler"),
-    ("AS", "Assembler"),
-    ("LINK", "Linker"),
+    ("CC", "C Compiler", "cc"),
+    ("CXX", "C++ Compiler", "c++"),
+    ("AS", "Assembler", "as"),
+    ("LINK", "Linker"), # SCons usually runs $CC or $CXX
+    ("AR", "Archiver", "ar"),
+    ("RANLIB", "Archiver Indexer", "ranlib"),
     ("NUMCPUS", "Number of CPUs to use for build (0 means auto)", 0, None, int),
     EnumVariable("BUILDTYPE", "Build type", "RELEASE", ["RELEASE", "DEBUG", "PERF"]),
     BoolVariable("VERBOSE", "Show full build information", 0),
@@ -44,14 +46,12 @@ opts.AddVariables(
     BoolVariable("WITH_GOOGLEPROF", "Link to Google CPU Profiler", 0),
     BoolVariable("WITH_TSAN", "Enable Clang Race Detector", 0),
     BoolVariable("WITH_ASAN", "Enable Clang AddressSanitizer", 0),
-    BoolVariable("WITH_LIBS3", "Include support for Amazon S3", 0),
     BoolVariable("BUILD_BINARIES", "Build binaries", 1),
     BoolVariable("CROSSCOMPILE", "Cross compile", 0),
-    BoolVariable("USE_FAKES3", "Send S3 requests to fakes3 instead of Amazon", 0),
     EnumVariable("HASH_ALGO", "Hash algorithm", "SHA256", ["SHA256"]),
     EnumVariable("COMPRESSION_ALGO", "Compression algorithm", "FASTLZ", ["LZMA", "FASTLZ", "SNAPPY", "NONE"]),
     EnumVariable("CHUNKING_ALGO", "Chunking algorithm", "RK", ["RK", "FIXED"]),
-    PathVariable("PREFIX", "Installation target directory", "/usr/local/bin/", PathVariable.PathAccept),
+    PathVariable("PREFIX", "Installation target directory", "/usr/local", PathVariable.PathAccept),
     PathVariable("DESTDIR", "The root directory to install into. Useful mainly for binary package building", "", PathVariable.PathAccept),
 )
 
@@ -121,12 +121,6 @@ else:
 if not env["WITH_MDNS"]:
     env.Append(CPPFLAGS = [ "-DWITHOUT_MDNS" ])
 
-if env["WITH_LIBS3"]:
-    env.Append(CPPFLAGS = [ "-DWITH_LIBS3" ])
-
-if env["USE_FAKES3"]:
-    env.Append(CPPDEFINES = ['USE_FAKES3'])
-
 if env["WITH_GPROF"]:
     env.Append(CPPFLAGS = [ "-pg" ])
     env.Append(LINKFLAGS = [ "-pg" ])
@@ -139,7 +133,7 @@ elif env["BUILDTYPE"] == "PERF":
     env.Append(CPPFLAGS = [ "-g", "-DNDEBUG", "-DORI_PERF", "-Wall", "-O2"])
     env.Append(LDFLAGS = [ "-g", "-rdynamic" ])
 elif env["BUILDTYPE"] == "RELEASE":
-    env.Append(CPPFLAGS = ["-DNDEBUG", "-DORI_RELEASE", "-Wall", "-O2"])
+    env.Append(CPPFLAGS = ["-DNDEBUG", "-DORI_RELEASE", "-w", "-O2"])
 else:
     print "Error BUILDTYPE must be RELEASE or DEBUG"
     sys.exit(-1)
@@ -193,8 +187,6 @@ elif sys.platform == "linux2" or sys.platform == "darwin":
     env.Append(CPPFLAGS = "-DHAVE_EXECINFO")
 
 if sys.platform == "win32":
-    env.Append(LIBPATH=['#../boost_1_53_0\stage\lib'],
-               CPPPATH=['#../boost_1_53_0'])
     env.Append(LIBPATH=['#../libevent-2.0.21-stable'],
                CPPPATH=['#../libevent-2.0.21-stable\include'])
 
@@ -213,6 +205,7 @@ if not conf.CheckCC():
     print 'Your C compiler and/or environment is incorrectly configured.'
     CheckFailed()
 
+env.AppendUnique(CXXFLAGS = ['-std=c++11'])
 if not conf.CheckCXX():
     print 'Your C++ compiler and/or environment is incorrectly configured.'
     CheckFailed()
@@ -225,35 +218,8 @@ else:
         print 'pkg-config not found!'
         Exit(1)
 
-#
-#env.AppendUnique(CXXFLAGS = ['-std=c++11'])
-#if not conf.CheckCXX():
-#    env['CXXFLAGS'].remove('-std=c++11')
-#
-#env.AppendUnique(CXXFLAGS = ['-std=c++0x'])
-#if not conf.CheckCXX():
-#    env['CXXFLAGS'].remove('-std=c++0x')
-#
-
-if conf.CheckCXXHeader('unordered_map'):
-    env.Append(CPPFLAGS = "-DHAVE_CXX11")
-elif conf.CheckCXXHeader('tr1/unordered_map'):
-    env.Append(CPPFLAGS = "-DHAVE_CXXTR1")
-else:
-    print 'Either C++11, C++0x, or C++ TR1 must be present!'
-    CheckFailed()
-
-if not conf.CheckCXXHeader('boost/uuid/uuid.hpp'):
-    print 'Boost UUID headers are missing!'
-    Exit(1)
-
-if not conf.CheckCXXHeader('boost/bind.hpp'):
-    print 'Boost bind headers are missing!'
-    Exit(1)
-
-if not conf.CheckCXXHeader('boost/date_time/posix_time/posix_time.hpp'):
-    print 'Boost posix_time headers are missing!'
-    Exit(1)
+if not conf.CheckCXXHeader('unordered_map'):
+    print 'C++11 libraries appear to be missing'
 
 if sys.platform.startswith("freebsd"):
     if not conf.CheckLib('execinfo'):
@@ -326,9 +292,6 @@ if sys.platform != "win32" and sys.platform != "darwin":
     env.Append(LIBS = ["pthread"])
 
 # Optional Components
-if env["WITH_LIBS3"]:
-    env.Append(CPPPATH = '#libs3-2.0/inc')
-    SConscript('libs3-2.0/SConscript', variant_dir='build/libs3-2.0')
 if env["COMPRESSION_ALGO"] == "SNAPPY":
     env.Append(CPPPATH = ['#snappy-1.0.5'])
     env.Append(LIBS = ["snappy"], LIBPATH = ['#build/snappy-1.0.5'])
@@ -363,8 +326,6 @@ if env["BUILD_BINARIES"]:
     SConscript('ori/SConscript', variant_dir='build/ori')
     SConscript('oridbg/SConscript', variant_dir='build/oridbg')
     SConscript('orisync/SConscript', variant_dir='build/orisync')
-    if env["WITH_LIBS3"]:
-        SConscript('oris3/SConscript', variant_dir='build/oris3')
     if env["WITH_FUSE"]:
         SConscript('orifs/SConscript', variant_dir='build/orifs')
     if env["WITH_HTTPD"]:
@@ -378,8 +339,6 @@ if env["WITH_FUSE"]:
 env.Install('$DESTDIR$PREFIX/bin','build/ori/ori')
 env.Install('$DESTDIR$PREFIX/bin','build/oridbg/oridbg')
 env.Install('$DESTDIR$PREFIX/bin','build/orisync/orisync')
-if env["WITH_LIBS3"]:
-    env.Install('$DESTDIR$PREFIX/bin','build/ori/oris3')
 if env["WITH_HTTPD"]:
     env.Install('$DESTDIR$PREFIX/bin','build/ori_httpd/ori_httpd')
 if env["WITH_ORILOCAL"]:

diff --git a/docs/ori.1 b/docs/ori.1
@@ -24,10 +24,10 @@ This list contains commands that will operate on your local instance of the
 repository.  These may callout to remote repositories for data if this was an 
 InstaCloned repository.
 .TP
-\fBcheckout\fR [--force] \fICOMMIT-HASH\fR
+\fBcheckout\fR [\-\-force] \fICOMMIT-HASH\fR
 Checkout a revision of the repository.  By default this applies the current 
 modified files onto the specified revision, but for most users the merge 
-command is a safer alternative.  The --force flag is used to discard current 
+command is a safer alternative.  The \-\-force flag is used to discard current 
 changes and checkout the revision specified.
 .TP
 \fBlog\fR
@@ -45,7 +45,7 @@ Remove the specified file system.
 \fBshow\fR
 Show repository information.
 .TP
-\fBsnapshot\fR [-m \fIMESSAGE\fR] [\fISNAPSHOT-NAME\fR]
+\fBsnapshot\fR [\-m \fIMESSAGE\fR] [\fISNAPSHOT-NAME\fR]
 Take a snapshot of the repository.  You may optionally supply a message to be 
 included and a name.
 .TP
@@ -65,7 +65,7 @@ repository named \fIorigin\fR is used as the default for certain operations
 that take an optional remote name. At the moment an InstaCloned repository can 
 only be created with \fBorifs\fR.
 .TP
-\fBreplicate\fR [--ondemand] \fISOURCE-PATH\fR
+\fBreplicate\fR [\-\-ondemand] \fISOURCE-PATH\fR
 Clone a remote or local repository into a new directory.
 .TP
 \fBpull\fR [\fIPATH|REMOTE-NAME\fR]

diff --git a/docs/oridbg.1 b/docs/oridbg.1
@@ -29,7 +29,7 @@ Remove the specified file system.
 \fBshow\fR
 Show repository information.
 .TP
-\fBsnapshot\fR [-m \fIMESSAGE\fR] [\fISNAPSHOT-NAME\fR]
+\fBsnapshot\fR [\-m \fIMESSAGE\fR] [\fISNAPSHOT-NAME\fR]
 Take a snapshot of the repository.  You may optionally supply a message to be 
 included and a name.
 .TP

diff --git a/docs/orifs.1 b/docs/orifs.1
@@ -16,26 +16,26 @@ bug will addressed.
 
 .SH OPTIONS
 .TP
-\fB\--repo=[\fIFS-NAME\fR]\fR
+\fB\-\-repo=[\fIFS-NAME\fR]\fR
 Specify the path to the underlying repository.  This parameter is optional and 
 by default orifs will search for a file system with the same name as the mount 
 point.
 .TP
-\fB\--clone=[\fIREMOTEPATH\fR]\fR
+\fB\-\-clone=[\fIREMOTEPATH\fR]\fR
 Replicate the file system from the specified repository.
 .TP
-\fB\--shallow\fR
-Used in conjunction with --clone to specify a shallow replica of the remote 
+\fB\-\-shallow\fR
+Used in conjunction with \-\-clone to specify a shallow replica of the remote 
 repository.
 .TP
-\fB\--nocache\fR
-Used in conjunction with --clone to specify a non-caching replica of the remote 
+\fB\-\-nocache\fR
+Used in conjunction with \-\-clone to specify a non-caching replica of the remote 
 repository.
 .TP
-\fB\--no-threads\fR
+\fB\-\-no-threads\fR
 Disable multithreading on FUSE.
 .TP
-\fB\--debug\fR
+\fB\-\-debug\fR
 Enable debugging mode with verbose output.  The file system will run much 
 slower, but is useful for reporting crashes.
 

diff --git a/libori/SConscript b/libori/SConscript
@@ -36,6 +36,7 @@ env.StaticLibrary("ori", src)
 
 # Test Binaries
 if env["BUILD_BINARIES"]:
+    #env.Program("rkchunker_test", "rkchunker_test.cc")
     env.Program("rkchunker", "rkchunker.cc")
     env.Program("fchunker", "fchunker.cc")
 
diff --git a/libori/fchunker.cc b/libori/fchunker.cc
@@ -14,10 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <assert.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cinttypes>
 
 #include <time.h>
 #include <sys/time.h>
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
     float tDiff = end.tv_sec - start.tv_sec;
     tDiff += (float)(end.tv_usec - start.tv_usec) / 10000000.0;
 
-    printf("Chunks %llu, Avg Chunk %llu\n", cb.chunks, cb.chunkLen / cb.chunks);
+    printf("Chunks %" PRIu64 ", Avg Chunk %" PRIu64 "\n", cb.chunks, cb.chunkLen / cb.chunks);
     printf("Time %3.3f, Speed %3.2fMB/s\n", tDiff, 1024.0 / tDiff);
 
     assert(cb.chunks == TEST_LEN / CHUNK_LEN);

diff --git a/libori/httprepo.cc b/libori/httprepo.cc
@@ -30,10 +30,9 @@
 
 #include <openssl/sha.h>
 
-#include <boost/date_time/posix_time/posix_time.hpp>
-
 #include <oriutil/debug.h>
 #include <oriutil/oriutil.h>
+#include <oriutil/stopwatch.h>
 #include <ori/object.h>
 #include <ori/httpclient.h>
 #include <ori/httprepo.h>
@@ -92,15 +91,16 @@ HttpRepo::getHead()
 int
 HttpRepo::distance()
 {
-    boost::posix_time::ptime t_begin =
-        boost::posix_time::microsec_clock::local_time();
+    Stopwatch sw;
+
+    sw.start();
 
     std::string uuid = getUUID();
     assert(uuid != "");
+
+    sw.stop();
 
-    boost::posix_time::ptime t_end =
-        boost::posix_time::microsec_clock::local_time();
-    return (t_end - t_begin).total_milliseconds();
+    return sw.getElapsedMS();
 }
 
 Object::sp

diff --git a/libori/httpserver.cc b/libori/httpserver.cc
@@ -101,6 +101,12 @@ HTTPServer::start(bool mDNSEnable)
     event_base_dispatch(base);
 }
 
+void
+HTTPServer::stop()
+{
+    event_base_loopexit(base, NULL);
+}
+
 void
 HTTPServer::entry(struct evhttp_request *req)
 {

diff --git a/libori/index.cc b/libori/index.cc
@@ -26,7 +26,7 @@
 #include <string>
 #include <set>
 #include <iostream>
-#include <boost/tr1/unordered_map.hpp>
+#include <unordered_map>
 
 #include <oriutil/debug.h>
 #include <oriutil/runtimeexception.h>
@@ -37,7 +37,6 @@
 #include <ori/index.h>
 
 using namespace std;
-using namespace std::tr1;
 
 /// Adds a checksum
 #define TOTAL_ENTRYSIZE (IndexEntry::SIZE + 16)

diff --git a/libori/largeblob.cc b/libori/largeblob.cc
@@ -14,11 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
+#include <cstdio>
+#include <cstdint>
 #include <cstdlib>
+#include <cstring>
+#include <cinttypes>
 
 #include <unistd.h>
 #include <sys/stat.h>
@@ -268,13 +268,13 @@ LargeBlob::read(uint8_t *buf, size_t s, off_t off) const
     }
 
     if (it == parts.end()) {
-        LOG("offset %llu larger than large blob", off);
+        LOG("offset %" PRIu64 " larger than large blob", off);
         return 0;
     }
 
     off_t part_off = off - (*it).first;
     if (part_off >= (*it).second.length) {
-        LOG("offset %llu larger than last blob in LB", off);
+        LOG("offset %" PRIu64 " larger than last blob in LB", off);
         ASSERT(false);
         return 0;
     }
@@ -310,12 +310,9 @@ LargeBlob::getBlob()
     size_t num = parts.size();
     ss.writeUInt64(num);
 
-    for (map<uint64_t, LBlobEntry>::iterator it = parts.begin();
-            it != parts.end();
-            it++)
-    {
-        ss.writeHash((*it).second.hash);
-        ss.writeUInt16((*it).second.length);
+    for (auto &it : parts) {
+        ss.writeHash(it.second.hash);
+        ss.writeUInt16(it.second.length);
     }
 
     return ss.str();
@@ -345,10 +342,8 @@ size_t
 LargeBlob::totalSize() const
 {
     size_t total = 0;
-    for (map<uint64_t, LBlobEntry>::const_iterator it = parts.begin();
-            it != parts.end(); it++)
-    {
-        total += (*it).second.length;
+    for (auto const &it : parts) {
+        total += it.second.length;
     }
 
     return total;