boost/process
2
0
Fork 0
mirror of https://github.com/boostorg/process.git synced 2026-02-09 11:22:17 +00:00
Code Issues Projects Releases Wiki Activity

changed error macros to require a ; at the end.

Browse Source
This commit is contained in:
Klemens Morgenstern
2024-10-27 12:54:16 +08:00
parent 941e93b587
commit 817128108a
20 changed files with 143 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/pid.cpp
View File

@@ -74,7 +74,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
HANDLE hp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (!hp)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
PROCESSENTRY32 pe;
@@ -96,7 +96,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
HANDLE hp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (!hp)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
PROCESSENTRY32 pe;
@@ -123,7 +123,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
HANDLE hp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (!hp)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
PROCESSENTRY32 pe;
@@ -152,7 +152,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
const auto sz = proc_listpids(PROC_ALL_PIDS, 0, &vec[0], sizeof(pid_type) * vec.size());
if (sz < 0)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return {};
}
vec.resize(sz);
@@ -165,7 +165,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
proc_bsdinfo proc_info;
if (proc_pidinfo(pid, PROC_PIDTBSDINFO, 0, &proc_info, sizeof(proc_info)) <= 0)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
else
@@ -180,7 +180,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
const auto sz = proc_listpids(PROC_PPID_ONLY, (uint32_t)pid, &vec[0], sizeof(pid_type) * vec.size());
if (sz < 0)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return {};
}
vec.resize(sz);
@@ -195,7 +195,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
DIR *proc = opendir("/proc");
if (!proc)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
struct dirent *ent = nullptr;
@@ -218,9 +218,9 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
if (!stat)
{
if (errno == ENOENT)
BOOST_PROCESS_V2_ASSIGN_EC(ec, ESRCH, system_category())
BOOST_PROCESS_V2_ASSIGN_EC(ec, ESRCH, system_category());
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
else
@@ -245,7 +245,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
if (!token)
{
fclose(stat);
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
}
@@ -286,7 +286,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
free(proc_info);
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -300,7 +300,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
free(proc_info);
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
@@ -322,7 +322,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
free(proc_info);
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -346,7 +346,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, &cntp)))
@@ -357,7 +357,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
vec.push_back(proc_info[i].kp_pid);
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -379,7 +379,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, &cntp)))
@@ -390,7 +390,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
}
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
@@ -412,7 +412,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, &cntp)))
@@ -427,7 +427,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
}
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -449,7 +449,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &cntp)))
@@ -461,7 +461,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
}
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -481,7 +481,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &cntp)))
@@ -489,7 +489,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
ppid = proc_info->p_ppid;
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
@@ -509,7 +509,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &cntp)))
@@ -524,7 +524,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
}
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -546,7 +546,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &cntp)))
@@ -561,7 +561,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
}
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -581,7 +581,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &cntp)))
@@ -589,7 +589,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
ppid = proc_info->p_ppid;
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
@@ -609,7 +609,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &cntp)))
@@ -624,7 +624,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
}
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
@@ -647,7 +647,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
while ((proc_info = kvm_nextproc(kd)))
@@ -658,7 +658,7 @@ std::vector<pid_type> all_pids(boost::system::error_code & ec)
}
else
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
break;
}
}
@@ -680,7 +680,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
if ((proc_info = kvm_getproc(kd, pid)))
@@ -688,7 +688,7 @@ pid_type parent_pid(pid_type pid, boost::system::error_code & ec)
ppid = proc_info->p_ppid;
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return ppid;
}
@@ -708,7 +708,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr);
if (!kd)
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
}
while ((proc_info = kvm_nextproc(kd)))
@@ -721,7 +721,7 @@ std::vector<pid_type> child_pids(pid_type pid, boost::system::error_code & ec)
}
else
{
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
break;
}
}