diff --git a/.gitattributes b/.gitattributes
index 4fded91..ad4de08 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-*.nas linguist-language=nasal
\ No newline at end of file
+*.nas linguist-language=Nasal
\ No newline at end of file
diff --git a/test/httptest.nas b/test/httptest.nas
index a75a161..6090c21 100644
--- a/test/httptest.nas
+++ b/test/httptest.nas
@@ -235,11 +235,11 @@ var html_read_file=func(filename){
var respond={
ok:func(html){
- println("[",os.time(),"] 200 OK");
+ println("[",os.time(),"] respond 200 OK");
return "Http/1.1 200 OK\n\n"~html~"\n";
},
not_found:func(){
- println("[",os.time(),"] 404 NOT FOUND");
+ println("[",os.time(),"] respond 404 NOT FOUND");
return "Http/1.1 404 NOT FOUND\n\n
404 not found
@@ -253,7 +253,7 @@ var respond={
\n";
},
teapot:func(){
- println("[",os.time(),"] 418 I'm a teapot");
+ println("[",os.time(),"] respond 418 I'm a teapot");
return "Http/1.1 418 I'm a teapot\n\n
I'm a teapot
diff --git a/test/occupation.nas b/test/occupation.nas
index 6632da7..abf45fe 100644
--- a/test/occupation.nas
+++ b/test/occupation.nas
@@ -1,3 +1,6 @@
+import("stl/process_bar.nas");
+import("module/libkey.nas");
+
var cpu_stat=func(){
var cpu=split("\n",io.fin("/proc/stat"))[0];
cpu=split(" ",cpu);
@@ -38,13 +41,19 @@ func(){
println("haven't supported yet.");
return;
}
+ print("\ec");
while(1){
var mem=mem_occupation();
var mem_occ=(mem.MemTotal-mem.MemFree)/mem.MemTotal*100;
var cpu_occ=cpu_occupation();
- println("CPU occupation(%) : ",cpu_occ>90?"\e[91m":"\e[32m",cpu_occ,"\e[0m");
- println("Memory total(GB) : \e[36m",mem.MemTotal/1024/1024,"\e[0m");
- println("Memory free(GB) : \e[36m",mem.MemFree/1024/1024,"\e[0m");
- println("Memory occupation(%): ",mem_occ>60?"\e[91m":"\e[32m",mem_occ,"\e[0m");
+ var key=libkey.nonblock();
+ var bar=process_bar.bar("block","point","line",25);
+ if(key!=nil and chr(key)=="q")
+ break;
+ println("\e[1;1H Memory total(GB) : \e[36m",mem.MemTotal/1024/1024,"\e[0m");
+ println("\e[2;1H Memory free(GB) : \e[36m",mem.MemFree/1024/1024,"\e[0m");
+ println("\e[3;1H Memory occupation(%): ",mem_occ>60?"\e[91m":"\e[32m",bar.bar(mem_occ/100)~" ",mem_occ,"\e[0m ");
+ println("\e[4;1H CPU occupation(%) : ",cpu_occ>90?"\e[91m":"\e[32m",bar.bar(cpu_occ/100)~" ",cpu_occ,"\e[0m ");
+ println("\e[5;1H Press 'q' to quit.");
}
}();
\ No newline at end of file