File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change 1
1
#include "swap.h"
2
+ #include "util/FFlist.h"
2
3
#include "util/mallocHelper.h"
3
4
4
5
#include <sys/types.h>
5
6
#include <sys/swap.h>
6
7
#include <sys/param.h>
7
8
#include <unistd.h>
8
9
9
- const char * ffDetectSwap (FFSwapResult * swap )
10
+ const char * ffDetectSwap (FFlist * result )
10
11
{
11
12
int nswap = swapctl (SWAP_NSWAP , 0 , 0 );
12
13
if (nswap < 0 ) return "swapctl(SWAP_NSWAP) failed" ;
@@ -17,17 +18,16 @@ const char* ffDetectSwap(FFSwapResult* swap)
17
18
if (swapctl (SWAP_STATS , swdev , nswap ) < 0 )
18
19
return "swapctl(SWAP_STATS) failed" ;
19
20
20
- uint64_t swapTotal = 0 , swapUsed = 0 ;
21
21
for (int i = 0 ; i < nswap ; i ++ )
22
22
{
23
23
if (swdev [i ].se_flags & SWF_ENABLE )
24
24
{
25
- swapUsed += (uint64_t ) swdev [i ].se_inuse ;
26
- swapTotal += (uint64_t ) swdev [i ].se_nblks ;
25
+ FFSwapResult * swap = ffListAdd (result );
26
+ ffStrbufInitS (& swap -> name , swdev [i ].se_path );
27
+ swap -> bytesUsed = (uint64_t ) swdev [i ].se_inuse * DEV_BSIZE ;
28
+ swap -> bytesTotal = (uint64_t ) swdev [i ].se_nblks * DEV_BSIZE ;
27
29
}
28
30
}
29
- swap -> bytesUsed = swapUsed * DEV_BSIZE ;
30
- swap -> bytesTotal = swapTotal * DEV_BSIZE ;
31
31
32
32
return NULL ;
33
33
}
You can’t perform that action at this time.
0 commit comments