Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Fri, 17 Feb 2012 06:19:36 +0000 (00:19 -0600)
committerYanhua Sun <yanhuas@jyc1.(none)>
Fri, 17 Feb 2012 06:19:36 +0000 (00:19 -0600)
src/arch/gemini_gni/machine.c

index 638497563ff40d6a0ca1faad4a6ad1db9505cfa6..1fe214176db39a29e7fd1e453719fc3073a17fdd 100644 (file)
@@ -107,17 +107,19 @@ static dynamic_smsg_mailbox_t  *mailbox_list;
 #endif
 
 #define oneMB (1024ll*1024)
-#if CMK_SMP
 static CmiInt8 _mempool_size = 8*oneMB;
-#else
-static CmiInt8 _mempool_size = 32*oneMB;
-#endif
 static CmiInt8 _expand_mem =  4*oneMB;
 #endif
 
+#if CMK_SMP
 //Dynamic flow control about memory registration
-static CmiInt8  MAX_BUFF_SEND  =  2*oneMB*oneMB;
-static CmiInt8  MAX_REG_MEM    =  2*oneMB*oneMB;
+static CmiInt8  MAX_BUFF_SEND  =  100*oneMB;
+static CmiInt8  MAX_REG_MEM    =  200*oneMB;
+#else
+static CmiInt8  MAX_BUFF_SEND  =  16*oneMB;
+static CmiInt8  MAX_REG_MEM    =  20*oneMB;
+#endif
+
 static CmiInt8 buffered_send_msg = 0;
 
 #define BIG_MSG                  16*oneMB