OctaForge
/
libostd
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

move_data/swap_data is platform independent

master
Daniel Kolesa 2017-05-08 20:36:59 +02:00
parent ea7f4062b7
commit 5d16d8fd87
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/process.cc
View File

@ -286,27 +286,6 @@ OSTD_EXPORT void subprocess::reset() {
p_current = nullptr;
}
OSTD_EXPORT void subprocess::move_data(subprocess &i) {
data *od = static_cast<data *>(i.p_current);
if (!od) {
return;
}
p_current = ::new (reinterpret_cast<void *>(&p_data)) data{*od};
i.p_current = nullptr;
}
OSTD_EXPORT void subprocess::swap_data(subprocess &i) {
if (!p_current) {
move_data(i);
} else if (!i.p_current) {
i.move_data(*this);
} else {
std::swap(
*static_cast<data *>(p_current), *static_cast<data *>(i.p_current)
);
}
}
OSTD_EXPORT int subprocess::close() {
if (!p_current) {
throw process_error{ECHILD, std::generic_category()};
@ -333,6 +312,10 @@ OSTD_EXPORT int subprocess::close() {
#else /* OSTD_PLATFORM_WIN32 */
struct data {
HANDLE process = nullptr, thread = nullptr;
};
OSTD_EXPORT void subprocess::open_impl(
std::string const &, std::vector<std::string> const &, bool
) {
@ -348,6 +331,27 @@ OSTD_EXPORT void subprocess::reset() {
#endif
OSTD_EXPORT void subprocess::move_data(subprocess &i) {
data *od = static_cast<data *>(i.p_current);
if (!od) {
return;
}
p_current = ::new (reinterpret_cast<void *>(&p_data)) data{*od};
i.p_current = nullptr;
}
OSTD_EXPORT void subprocess::swap_data(subprocess &i) {
if (!p_current) {
move_data(i);
} else if (!i.p_current) {
i.move_data(*this);
} else {
std::swap(
*static_cast<data *>(p_current), *static_cast<data *>(i.p_current)
);
}
}
OSTD_EXPORT subprocess::~subprocess() {
try {
close();