浏览代码

HPCC-14060 Remove legacy largeMemSize

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Jake Smith 9 年之前
父节点
当前提交
4dcaeb5f0f
共有 4 个文件被更改,包括 1 次插入24 次删除
  1. 1 5
      thorlcr/graph/thgraph.cpp
  2. 0 16
      thorlcr/thorutil/thmem.cpp
  3. 0 2
      thorlcr/thorutil/thmem.hpp
  4. 0 1
      thorlcr/thorutil/thormisc.hpp

+ 1 - 5
thorlcr/graph/thgraph.cpp

@@ -2516,17 +2516,13 @@ void CJobBase::init()
     thorAllocator.setown(createThorAllocator(((memsize_t)globalMemorySize)*0x100000, memorySpillAt, *logctx, crcChecking, usePackedAllocator));
 
     unsigned defaultMemMB = globalMemorySize*3/4;
-    unsigned largeMemSize = getOptUInt("largeMemSize", defaultMemMB);
-    if (globalMemorySize && largeMemSize >= globalMemorySize)
-        throw MakeStringException(0, "largeMemSize(%d) can not exceed globalMemorySize(%d)", largeMemSize, globalMemorySize);
-    PROGLOG("Global memory size = %d MB, memory spill at = %d%%, large mem size = %d MB", globalMemorySize, memorySpillAt, largeMemSize);
+    PROGLOG("Global memory size = %d MB, memory spill at = %d%%", globalMemorySize, memorySpillAt);
     StringBuffer tracing("maxActivityCores = ");
     if (maxActivityCores)
         tracing.append(maxActivityCores);
     else
         tracing.append("[unbound]");
     PROGLOG("%s", tracing.str());
-    setLargeMemSize(largeMemSize);
     graphExecutor.setown(new CGraphExecutor(*this));
 }
 

+ 0 - 16
thorlcr/thorutil/thmem.cpp

@@ -101,22 +101,6 @@ extern graph_decl void setMultiThorMemoryNotify(size32_t size,ILargeMemLimitNoti
 }
 
 
-static memsize_t largeMemSize = 0;
-memsize_t setLargeMemSize(unsigned limitMB)
-{
-    memsize_t prevLargeMemSize = largeMemSize;
-    largeMemSize = 1024*1024*(memsize_t)limitMB;
-    return prevLargeMemSize;
-}
-
-memsize_t queryLargeMemSize()
-{
-    if (0 == largeMemSize)
-        throwUnexpected();
-    return largeMemSize;
-}
-
-
 // =================================
 
 StringBuffer &getRecordString(const void *key, IOutputRowSerializer *serializer, const char *prefix, StringBuffer &out)

+ 0 - 2
thorlcr/thorutil/thmem.hpp

@@ -186,8 +186,6 @@ public:
 extern graph_decl void checkMultiThorMemoryThreshold(bool inc);
 extern graph_decl void setMultiThorMemoryNotify(size32_t size,ILargeMemLimitNotify *notify);
 
-extern graph_decl memsize_t setLargeMemSize(unsigned limit);
-
 /////////////
 
 // JCSMORE

+ 0 - 1
thorlcr/thorutil/thormisc.hpp

@@ -424,7 +424,6 @@ enum SlaveMsgTypes { smt_errorMsg=1, smt_initGraphReq, smt_initActDataReq, smt_d
 // Logging
 extern graph_decl const LogMsgJobInfo thorJob;
 
-extern graph_decl memsize_t queryLargeMemSize();
 extern graph_decl StringBuffer &getCompoundQueryName(StringBuffer &compoundName, const char *queryName, unsigned version);
 
 extern graph_decl void setClusterGroup(IGroup *group);