Skip to content

Commit

Permalink
Fix Phisical = remove. Add number of processes
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Jun 2, 2014
1 parent ae73c16 commit 739cb0b
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 37 deletions.
5 changes: 0 additions & 5 deletions JSON/i-nex-usage.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ int main() {
if(sysinfo(&sys_info) != 0)
perror("sysinfo");

physMemUsed *= sys_info.mem_unit;
totalVirtualMem += sys_info.totalswap;
totalVirtualMem *= sys_info.mem_unit;
total_bytes = sys_info.mem_unit * sys_info.totalram;

days = sys_info.uptime / 86400;
Expand Down Expand Up @@ -98,8 +95,6 @@ int main() {
printf(" \"FREE_SWAP\": %ld ,\n", sys_info.freeswap /1024/1024);
printf(" \"TOTAL_HIGH\": %ld ,\n", sys_info.totalhigh /1024/1024);
printf(" \"FREE_HIGH\": %ld ,\n", sys_info.freehigh /1024/1024);
printf(" \"PHYS_MEM_USED\": %llu ,\n", physMemUsed /1024/1024);
printf(" \"TOTAL_VIRTUAL_MEM\": %llu ,\n", totalVirtualMem /1024/1024);
printf(" \"NUMBER_OF_PROCESSES\": %d \n", sys_info.procs);
printf("}\n");

Expand Down
12 changes: 6 additions & 6 deletions src/i-nex/.settings
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SearchComment=False
SearchString=True

[OpenFile]
Active=1
File[1]=".src/Finfosys.form"
File[2]=".src/Global.class:204.27"
File[3]=".src/About.form"
Expand All @@ -48,13 +49,12 @@ File[21]=".src/Network.module:15.70"
File[22]="Data/report-ng.sh:5.3"
File[23]=".src/Distribution_Detect.module:66.25"
File[24]=".src/FFlags.module:19.14"
Active=25
File[25]=".src/Finfosys.class:929.24"
File[25]=".src/Finfosys.class:535.17"
File[26]=".src/FDF.form"
File[27]=".src/FDF.class:15.70"
File[28]=".src/FNET_R_T.form"
File[29]=".src/FNET_R_T.class:15.70"
File[30]=".src/FGraphic.module:15.70"
File[30]=".src/FGraphic.module:32.8"
File[31]=".src/FCPU.module:15.70"
File[32]=".src/FUdisks.form"
File[33]=".src/FUdisks.class:15.70"
Expand All @@ -79,17 +79,17 @@ File[51]=".src/Reports/MDRIVES_REPORT.module:7.0"
File[52]=".src/FInputDate.form"
File[53]=".src/MInit.module:48.32"
File[54]=".src/FEDID.form"
File[55]=".src/FEDID.class:80.27"
File[55]=".src/FEDID.class:29.35"
File[56]=".src/Logger.class:15.70"
File[57]=".src/Formatter.module:15.70"
File[58]=".src/FDirDialog.class:15.70"
File[59]=".src/FFileDialog.class:99.2"
File[60]=".src/FInputDate.class:15.70"
File[61]=".src/FDIMM.form"
File[62]=".src/FDIMM.class:58.40"
File[62]=".src/FDIMM.class:71.4"
File[63]=".src/Reports/FCPUID_REPORT.module:28.92"
File[64]=".src/MCPUSAGE.module:31.0"
File[65]=".src/Reports/VALIDATE.module:147.37"
File[65]=".src/Reports/VALIDATE.module:126.16"
File[66]=".src/FValidate.form"
File[67]=".src/FValidate.class:16.1"
File[68]=".src/FCopyUrl.form"
Expand Down
5 changes: 1 addition & 4 deletions src/i-nex/.src/Finfosys.class
Original file line number Diff line number Diff line change
Expand Up @@ -517,9 +517,6 @@ Public Sub dospam_uptime()
Label91.Text = "SWAP Total: " &
Int(USAGE["SWAP_TOTAL"]) &
" MB "
TextLabel15.Text = "Physical Memory Used: " &
Int(USAGE["PHYS_MEM_USED"]) &
" MB "
TextLabel24.Text = "SWAP memory used: " &
Int(USAGE["SWAP_USED"]) &
" MB"
Expand All @@ -536,8 +533,8 @@ Public Sub dospam_uptime()
"load average: " & Int(USAGE["LOAD_AVG_1MIN"]) & " " &
", " & Int(USAGE["LOAD_AVG_5MIN"]) & " " &
", " & Int(USAGE["LOAD_AVG_15MIN"])
Label74.Text = USAGE["NUMBER_OF_PROCESSES"]

Try ProgressBar6.Value = Int(USAGE["PHYS_MEM_USED"]) / Int(USAGE["TOTAL_VIRTUAL_MEM"])
Try ProgressBar1.Value = Int(USAGE["USED_PLUS_CACHED"]) / Int(USAGE["MEMORY_TOTAL"])
Try ProgressBar4.Value = Int(USAGE["SWAP_USED"]) / Int(USAGE["SWAP_TOTAL"])

Expand Down
46 changes: 24 additions & 22 deletions src/i-nex/.src/Finfosys.form
Original file line number Diff line number Diff line change
Expand Up @@ -1647,64 +1647,61 @@
Border = Border.Raised
}
{ Separator5 Separator
Move(0,231,469,21)
Move(0,196,469,21)
#Translate = False
}
{ Label176 Label
Move(0,210,343,21)
Move(0,175,343,21)
Font = Font["Bold,8"]
Padding = 3
Text = ("Label176")
Border = Border.Raised
}
{ ProgressBar6 ProgressBar
Move(0,105,469,21)
}
{ Label85 Label
Move(0,126,189,21)
Move(0,91,189,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Border = Border.Raised
}
{ Label86 Label
Move(0,147,189,21)
Move(0,112,189,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Border = Border.Raised
}
{ Label87 Label
Move(0,168,189,21)
Move(0,133,189,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Border = Border.Raised
}
{ Label88 Label
Move(0,189,189,21)
Move(0,154,189,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Border = Border.Raised
}
{ Label89 Label
Move(189,126,154,21)
Move(189,91,154,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Border = Border.Raised
}
{ Label90 Label
Move(189,147,154,21)
Move(189,112,154,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Alignment = Align.Left
Border = Border.Raised
}
{ Label91 Label
Move(189,189,154,21)
Move(189,154,154,21)
Font = Font["Bold,8"]
Expand = True
Padding = 3
Expand All @@ -1718,26 +1715,31 @@
Alignment = Align.Center
Border = Border.Raised
}
{ TextLabel15 TextLabel
Move(0,84,469,21)
Font = Font["Bold,8"]
Padding = 1
Text = ("TextLabel15")
Alignment = Align.Center
Border = Border.Raised
}
{ ScrollView2 ScrollView
Move(0,252,469,224)
Move(0,217,469,259)
Font = Font["8"]
}
{ Label227 Label
Move(154,231,168,21)
Move(154,196,168,21)
#Translate = False
Font = Font["Bold,8"]
Text = "MTRR"
Alignment = Align.Center
Transparent = True
}
{ Label74 Label
Move(350,119,112,77)
Font = Font["Bold,20"]
Foreground = &HFF7F00&
Alignment = Align.Center
}
{ Label77 Label
Move(343,91,119,21)
Font = Font["Bold,8"]
Text = ("Processes ↓")
Alignment = Align.Center
Border = Border.Raised
}
Index = 8
Text = "Network"
Picture = Picture["AppIcons/Finfosys/network-wired.png"]
Expand Down

0 comments on commit 739cb0b

Please sign in to comment.