commit a7ed62a12182122a0c80481817256fa0b4f4b0e4
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Fri Jan 25 13:14:37 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Fri Jan 25 13:14:37 2013 -0800
tree 70faf6998ba53d451f17d8c4c64bda9738863264
parent c8ffd599bbe3b69cacddc1176735a7bcf0827fd5

take out poolSize param in dispatcher

src/dispatcher.cc

diff --git a/src/dispatcher.cc b/src/dispatcher.cc
index a0ef0a1..6635c12 100644
--- a/src/dispatcher.cc
+++ b/src/dispatcher.cc
@@ -38,13 +38,12 @@
                        , const std::string &sharedFolder
                        , const filesystem::path &rootDir
                        , Ccnx::CcnxWrapperPtr ccnx
-                       , int poolSize
                        , bool enablePrefixDiscovery
                        )
            : m_ccnx(ccnx)
            , m_core(NULL)
            , m_rootDir(rootDir)
-           , m_executor(1/*poolSize*/) // creates problems with file assembly. need to ensure somehow that FinishExectute is called after all Segment_Execute finished
+           , m_executor(1) // creates problems with file assembly. need to ensure somehow that FinishExectute is called after all Segment_Execute finished
            , m_objectManager(ccnx, rootDir)
            , m_localUserName(localUserName)
            , m_sharedFolder(sharedFolder)

src/dispatcher.h

diff --git a/src/dispatcher.h b/src/dispatcher.h
index 540bca1..b2b1e5c 100644
--- a/src/dispatcher.h
+++ b/src/dispatcher.h
@@ -50,7 +50,6 @@
              , const std::string &sharedFolder
              , const boost::filesystem::path &rootDir
              , Ccnx::CcnxWrapperPtr ccnx
-             , int poolSize = 2
              , bool enablePrefixDiscovery = true
              );
   ~Dispatcher();

test/test-dispatcher.cc

diff --git a/test/test-dispatcher.cc b/test/test-dispatcher.cc
index e3918f8..f81d807 100644
--- a/test/test-dispatcher.cc
+++ b/test/test-dispatcher.cc
@@ -71,9 +71,9 @@
   cleanDir(dir1);
   cleanDir(dir2);
 
-  Dispatcher d1(user1, folder, dir1, ccnx1, 2, false);
+  Dispatcher d1(user1, folder, dir1, ccnx1);
   usleep(100);
-  Dispatcher d2(user2, folder, dir2, ccnx2, 2, false);
+  Dispatcher d2(user2, folder, dir2, ccnx2);
 
   usleep(1000000);
 
@@ -87,7 +87,10 @@
 
   ofstream ofs;
   ofs.open(abf.string().c_str());
-  ofs << words;
+  for (int i = 0; i < 1000; i ++)
+  {
+    ofs << words;
+  }
   ofs.close();
 
   d1.Did_LocalFile_AddOrModify(filename);