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 55
66enum { FFMaxNSwap = 8 };
77
8- const char * ffDetectSwap (FFSwapResult * swap )
8+ const char * ffDetectSwap (FFlist * result )
99{
1010 char strings [FFMaxNSwap ][PATH_MAX ];
1111 uint8_t buffer [sizeof (swaptbl_t ) + sizeof (swapent_t ) * (FFMaxNSwap - 1 )] = {};
@@ -18,16 +18,14 @@ const char* ffDetectSwap(FFSwapResult* swap)
1818 if (size < 0 )
1919 return "swapctl() failed" ;
2020
21- swap -> bytesTotal = swap -> bytesUsed = 0 ;
22-
21+ uint32_t pageSize = instance .state .platform .sysinfo .pageSize ;
2322 for (int i = 0 ; i < size ; ++ i )
2423 {
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 ;
2728 }
28- swap -> bytesUsed = swap -> bytesTotal - swap -> bytesUsed ;
29- swap -> bytesTotal *= instance .state .platform .sysinfo .pageSize ;
30- swap -> bytesUsed *= instance .state .platform .sysinfo .pageSize ;
3129
3230 return NULL ;
3331}
You can’t perform that action at this time.
0 commit comments