|
17 | 17 | #include <boost/algorithm/string/predicate.hpp> |
18 | 18 | #include <boost/filesystem.hpp> |
19 | 19 | #include <iostream> |
20 | | -#include "Common/System.h" |
21 | 20 | #include "ReadoutCard/ChannelFactory.h" |
22 | 21 | #include "CommandLineUtilities/Common.h" |
23 | 22 | #include "CommandLineUtilities/Options.h" |
@@ -74,28 +73,34 @@ class ProgramCleanup : public Program |
74 | 73 | Pda::freePdaDmaBuffers(); |
75 | 74 |
|
76 | 75 | std::cout << "Removing CRORC FIFO shared memory files" << std::endl; |
77 | | - system("rm /dev/shm/AliceO2_RoC_*"); |
| 76 | + sysIgnored("rm /dev/shm/AliceO2_RoC_*"); |
78 | 77 | std::cout << "Removing readout 2MB hugepage mappings" << std::endl; |
79 | | - system("rm /var/lib/hugetlbfs/global/pagesize-2MB/readout*"); |
| 78 | + sysIgnored("rm /var/lib/hugetlbfs/global/pagesize-2MB/readout*"); |
80 | 79 | std::cout << "Removing readout 1GB hugepage mappings" << std::endl; |
81 | | - system("rm /var/lib/hugetlbfs/global/pagesize-1GB/readout*"); |
| 80 | + sysIgnored("rm /var/lib/hugetlbfs/global/pagesize-1GB/readout*"); |
82 | 81 | std::cout << "Removing roc-bench-dma 2MB hugepage mappings" << std::endl; |
83 | | - system("rm /var/lib/hugetlbfs/global/pagesize-2MB/roc-bench-dma*"); |
| 82 | + sysIgnored("rm /var/lib/hugetlbfs/global/pagesize-2MB/roc-bench-dma*"); |
84 | 83 | std::cout << "Removing roc-bench-dma 1GB hugepage mappings" << std::endl; |
85 | | - system("rm /var/lib/hugetlbfs/global/pagesize-1GB/roc-bench-dma*"); |
| 84 | + sysIgnored("rm /var/lib/hugetlbfs/global/pagesize-1GB/roc-bench-dma*"); |
86 | 85 |
|
87 | 86 | if (!mOptions.light) { |
88 | 87 | std::cout << "Removing uio_pci_dma" << std::endl; |
89 | | - system("modprobe -r uio_pci_dma"); |
| 88 | + sysIgnored("modprobe -r uio_pci_dma"); |
90 | 89 | std::cout << "Reinserting uio_pci_dma" << std::endl; |
91 | | - system("modprobe uio_pci_dma"); |
| 90 | + sysIgnored("modprobe uio_pci_dma"); |
92 | 91 | } |
93 | 92 | } |
94 | 93 |
|
95 | 94 | private: |
96 | 95 | struct OptionsStruct { |
97 | 96 | bool light = false; |
98 | 97 | } mOptions; |
| 98 | + |
| 99 | + // Ignore system()'s return value |
| 100 | + void sysIgnored(const char* command) |
| 101 | + { |
| 102 | + static_cast<void>(system(command)); |
| 103 | + } |
99 | 104 | }; |
100 | 105 |
|
101 | 106 | int main(int argc, char** argv) |
|
0 commit comments