File tree Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Original file line number Diff line number Diff line change 5
5
6
6
enum { FFMaxNSwap = 8 };
7
7
8
- const char * ffDetectSwap (FFSwapResult * swap )
8
+ const char * ffDetectSwap (FFlist * result )
9
9
{
10
10
char strings [FFMaxNSwap ][PATH_MAX ];
11
11
uint8_t buffer [sizeof (swaptbl_t ) + sizeof (swapent_t ) * (FFMaxNSwap - 1 )] = {};
@@ -18,16 +18,14 @@ const char* ffDetectSwap(FFSwapResult* swap)
18
18
if (size < 0 )
19
19
return "swapctl() failed" ;
20
20
21
- swap -> bytesTotal = swap -> bytesUsed = 0 ;
22
-
21
+ uint32_t pageSize = instance .state .platform .sysinfo .pageSize ;
23
22
for (int i = 0 ; i < size ; ++ i )
24
23
{
25
- swap -> bytesTotal += (uint64_t ) table -> swt_ent [i ].ste_pages ;
26
- swap -> bytesUsed += (uint64_t ) table -> swt_ent [i ].ste_free ;
24
+ FFSwapResult * swap = ffListAdd (result );
25
+ ffStrbufInitS (& swap -> name , table -> swt_ent [i ].ste_path );
26
+ swap -> bytesTotal = (uint64_t ) table -> swt_ent [i ].ste_pages * pageSize ;
27
+ swap -> bytesUsed = swap -> bytesTotal - (uint64_t ) table -> swt_ent [i ].ste_free * pageSize ;
27
28
}
28
- swap -> bytesUsed = swap -> bytesTotal - swap -> bytesUsed ;
29
- swap -> bytesTotal *= instance .state .platform .sysinfo .pageSize ;
30
- swap -> bytesUsed *= instance .state .platform .sysinfo .pageSize ;
31
29
32
30
return NULL ;
33
31
}
You can’t perform that action at this time.
0 commit comments