Increase USTACKPAGES and NOFILE

上级 b3dea7ca
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "wq.hh" #include "wq.hh"
#include "cilk.hh" #include "cilk.hh"
#define USTACKPAGES 2
#define BRK (USERTOP >> 1) #define BRK (USERTOP >> 1)
struct eargs { struct eargs {
......
...@@ -277,18 +277,19 @@ uwq::allocworker(void) ...@@ -277,18 +277,19 @@ uwq::allocworker(void)
p->ftable = ftable_; p->ftable = ftable_;
struct vmnode *vmn; struct vmnode *vmn;
if ((vmn = new vmnode(UWQSTACKPAGES)) == nullptr) { if ((vmn = new vmnode(USTACKPAGES)) == nullptr) {
finishproc(p); finishproc(p);
return nullptr; return nullptr;
} }
uptr stacktop = ustack_ + (UWQSTACKPAGES*PGSIZE); uptr stacktop = ustack_ + (USTACKPAGES*PGSIZE);
if (vmap_->insert(vmn, ustack_, 1) < 0) { if (vmap_->insert(vmn, ustack_, 1) < 0) {
delete vmn; delete vmn;
finishproc(p); finishproc(p);
return nullptr; return nullptr;
} }
ustack_ += (UWQSTACKPAGES*PGSIZE); // Include a bumper page
ustack_ += (USTACKPAGES*PGSIZE)+PGSIZE;
p->tf->rsp = stacktop - 8; p->tf->rsp = stacktop - 8;
p->tf->rip = uentry; p->tf->rip = uentry;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define DEBUG 1 #define DEBUG 1
#define NPROC 64 // maximum number of processes #define NPROC 64 // maximum number of processes
#define KSTACKSIZE 8192 // size of per-process kernel stack #define KSTACKSIZE 8192 // size of per-process kernel stack
#define NOFILE 32 // open files per process #define NOFILE 64 // open files per process
#define NFILE 100 // open files per system #define NFILE 100 // open files per system
#define NBUF 10000 // size of disk block cache #define NBUF 10000 // size of disk block cache
#define NINODE 5000 // maximum number of active i-nodes #define NINODE 5000 // maximum number of active i-nodes
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define ALLOC_MEMSET DEBUG #define ALLOC_MEMSET DEBUG
#define KSHAREDSIZE (32 << 10) #define KSHAREDSIZE (32 << 10)
#define USERWQSIZE (1 << 14) #define USERWQSIZE (1 << 14)
#define UWQSTACKPAGES 2 #define USTACKPAGES 4
#define WQSHIFT 7 #define WQSHIFT 7
#define CILKENABLE 0 #define CILKENABLE 0
#if defined(HW_josmp) #if defined(HW_josmp)
......
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论