ec use locations.

boostorg · Feb 8, 2023 · 81ad643 · 81ad643
1 parent 6fd1200
commit 81ad643
Show file tree

Hide file tree

Showing 26 changed files with 189 additions and 168 deletions.
diff --git a/include/boost/process/v2/cstring_ref.hpp b/include/boost/process/v2/cstring_ref.hpp
@@ -106,7 +106,7 @@ struct basic_cstring_ref
     BOOST_CXX14_CONSTEXPR const_reference at(size_type pos) const
     {
         if (pos >= size())
-            throw std::out_of_range("cstring-view out of range");
+            throw_exception(std::out_of_range("cstring-view out of range"));
         return view_[pos];
     }
     BOOST_CONSTEXPR const_reference front() const  {return *view_;}

diff --git a/include/boost/process/v2/detail/config.hpp b/include/boost/process/v2/detail/config.hpp
@@ -97,6 +97,14 @@ namespace filesystem = std::filesystem;
 using std::quoted;
 using std::optional;
 
+#define BOOST_PROCESS_V2_RETURN_EC(ev)                                                                  \
+  return ::BOOST_PROCESS_V2_NAMESPACE::error_code(ev, ::BOOST_PROCESS_V2_NAMESPACE::system_category()); \
+
+#define BOOST_PROCESS_V2_ASSIGN_EC(ec, ...) ec.assign(__VA_ARGS__);
+#define BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)                         \
+  ec.assign(::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error());   \
+
+
 #else
 
 using boost::system::error_code ;
@@ -112,6 +120,25 @@ namespace filesystem = std::filesystem;
 namespace filesystem = boost::filesystem;
 #endif
 
+#define BOOST_PROCESS_V2_RETURN_EC(ev)                                                                     \
+{                                                                                                          \
+  static constexpr auto loc##__LINE__((BOOST_CURRENT_LOCATION));                                           \
+  return ::BOOST_PROCESS_V2_NAMESPACE::error_code(ev, ::BOOST_PROCESS_V2_NAMESPACE::system_category(), &loc##__LINE__);   \
+}
+
+#define BOOST_PROCESS_V2_ASSIGN_EC(ec, ...)                       \
+{                                                                 \
+  static constexpr auto loc##__LINE__((BOOST_CURRENT_LOCATION));  \
+  ec.assign(__VA_ARGS__,  &loc##__LINE__);                        \
+}
+
+#define BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)                                         \
+{                                                                                      \
+  static constexpr auto loc##__LINE__((BOOST_CURRENT_LOCATION));                       \
+  ec.assign(::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error(), &loc##__LINE__);   \
+}
+
+
 #endif
 
 BOOST_PROCESS_V2_END_NAMESPACE
@@ -150,6 +177,4 @@ BOOST_PROCESS_V2_END_NAMESPACE
 #define BOOST_PROCESS_V2_HAS_PROCESS_HANDLE 1
 #endif
 
-
-
 #endif //BOOST_PROCESS_V2_DETAIL_CONFIG_HPP
diff --git a/include/boost/process/v2/detail/impl/environment_posix.ipp b/include/boost/process/v2/detail/impl/environment_posix.ipp
@@ -34,7 +34,7 @@ basic_cstring_ref<char_type, value_char_traits<char>> get(
     auto res = ::getenv(key.c_str());
     if (res == nullptr)
     {
-        ec.assign(ENOENT, system_category());
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, ENOENT, system_category())
         return {};
     }
     return res;
@@ -45,13 +45,13 @@ void set(basic_cstring_ref<char_type,   key_char_traits<char_type>>   key,
                 error_code & ec)
 {
     if (::setenv(key.c_str(), value.c_str(), true))
-        ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void unset(basic_cstring_ref<char_type, key_char_traits<char_type>> key, error_code & ec)
 {
     if (::unsetenv(key.c_str()))
-        ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 

diff --git a/include/boost/process/v2/detail/impl/environment_win.ipp b/include/boost/process/v2/detail/impl/environment_win.ipp
@@ -50,7 +50,7 @@ std::basic_string<char_type, value_char_traits<char_type>> get(
   buf.resize(size);
 
   if (buf.size() == 0)
-    ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 
   return buf;
 }
@@ -60,14 +60,14 @@ void set(basic_cstring_ref<char_type,   key_char_traits<char_type>>   key,
          error_code & ec)
 {
   if (!::SetEnvironmentVariableW(key.c_str(), value.c_str()))
-    ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void unset(basic_cstring_ref<char_type, key_char_traits<char_type>> key,
            error_code & ec)
 {
   if (!::SetEnvironmentVariableW(key.c_str(), nullptr))
-    ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 
@@ -88,7 +88,7 @@ std::basic_string<char, value_char_traits<char>> get(
   buf.resize(size);
 
   if (buf.size() == 0)
-    ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 
   return buf;
 }
@@ -98,14 +98,14 @@ void set(basic_cstring_ref<char,   key_char_traits<char>>   key,
          error_code & ec)
 {
   if (!::SetEnvironmentVariableA(key.c_str(), value.c_str()))
-    ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void unset(basic_cstring_ref<char, key_char_traits<char>> key,
            error_code & ec)
 {
   if (!::SetEnvironmentVariableA(key.c_str(), nullptr))
-    ec = ::BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();
+    BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 

diff --git a/include/boost/process/v2/detail/impl/last_error.ipp b/include/boost/process/v2/detail/impl/last_error.ipp
@@ -28,20 +28,6 @@ error_code get_last_error()
 
 }
 
-void throw_last_error()
-{
-    throw system_error(get_last_error());
-}
-void throw_last_error(const char * msg)
-{
-    throw system_error(get_last_error(), msg);
-}
-void throw_last_error(const std::string & msg)
-{
-    throw system_error(get_last_error(), msg);
-}
-
-
 }
 BOOST_PROCESS_V2_END_NAMESPACE
 

diff --git a/include/boost/process/v2/detail/impl/process_handle_windows.ipp b/include/boost/process/v2/detail/impl/process_handle_windows.ipp
@@ -34,15 +34,20 @@ void get_exit_code_(
     error_code & ec)
 {
     if (!::GetExitCodeProcess(handle, &exit_code))
-        ec = detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 
 HANDLE open_process_(DWORD pid)
 {
     auto proc = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE, FALSE, pid);
     if (proc == nullptr)
-        detail::throw_last_error("open_process()");
+    {
+        error_code ec;
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+        throw system_error(ec, "open_process()");
+    }
+
     return proc;
 }
 
@@ -61,7 +66,7 @@ bool check_handle_(HANDLE handle, error_code & ec)
 {
     if (handle == INVALID_HANDLE_VALUE)
     {
-        ec.assign(ERROR_INVALID_HANDLE_STATE, system_category());
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_INVALID_HANDLE_STATE, system_category())
         return false;
     }
     return true;
@@ -71,7 +76,7 @@ bool check_pid_(pid_type pid_, error_code & ec)
 {
     if (pid_ == 0)
     {
-        ec.assign(ERROR_INVALID_HANDLE_STATE, system_category());
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_INVALID_HANDLE_STATE, system_category())
         return false;
     }
     return true;
@@ -94,7 +99,7 @@ static BOOL CALLBACK enum_window(HWND hwnd, LPARAM param)
     LRESULT res = ::SendMessageW(hwnd, WM_CLOSE, 0, 0);
 
     if (res)
-        data->ec = detail::get_last_error();
+      BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(data->ec)
     return res == 0;
 }
 
@@ -103,25 +108,25 @@ void request_exit_(pid_type pid_, error_code & ec)
     enum_windows_data_t data{ec, pid_};
 
     if (!::EnumWindows(enum_window, reinterpret_cast<LONG_PTR>(&data)))
-        ec = detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void interrupt_(pid_type pid_, error_code & ec)
 {
     if (!::GenerateConsoleCtrlEvent(CTRL_C_EVENT, pid_))
-        ec = detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void terminate_(HANDLE handle, error_code & ec, DWORD & exit_status)
 {
     if (!::TerminateProcess(handle, 260))
-        ec = detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void check_running_(HANDLE handle, error_code & ec, DWORD & exit_status)
 {
     if (!::GetExitCodeProcess(handle, &exit_status))
-        ec = detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 #if !defined(BOOST_PROCESS_V2_DISABLE_UNDOCUMENTED_API)
@@ -130,25 +135,25 @@ void suspend_(HANDLE handle, error_code & ec)
     auto nt_err = NtSuspendProcess(handle);
     ULONG dos_err = RtlNtStatusToDosError(nt_err);
     if (dos_err)
-       ec = detail::get_last_error();
+       BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 
 void resume_(HANDLE handle, error_code & ec)
 {
     auto nt_err = NtResumeProcess(handle);
     ULONG dos_err = RtlNtStatusToDosError(nt_err);
     if (dos_err)
-        ec = detail::get_last_error();
+        BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
 }
 #else
 void suspend_(HANDLE, error_code & ec)
 {
-    ec.assign(ERROR_CALL_NOT_IMPLEMENTED, system_category());
+    BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_CALL_NOT_IMPLEMENTED, system_category())
 }
 
 void resume_(HANDLE handle, error_code & ec)
 {
-    ec.assign(ERROR_CALL_NOT_IMPLEMENTED, system_category());
+    BOOST_PROCESS_V2_ASSIGN_EC(ec, ERROR_CALL_NOT_IMPLEMENTED, system_category())
 }
 #endif
 

diff --git a/include/boost/process/v2/detail/impl/utf8.ipp b/include/boost/process/v2/detail/impl/utf8.ipp
@@ -27,13 +27,13 @@ inline void handle_error(error_code & ec)
     switch (err)
     {
     case ERROR_INSUFFICIENT_BUFFER:
-        ec.assign(error::insufficient_buffer, error::utf8_category);
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::utf8_category)
         break;
     case ERROR_NO_UNICODE_TRANSLATION:
-        ec.assign(error::invalid_character, error::utf8_category);
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::utf8_category)
         break;
     default:
-        ec.assign(err, system_category());
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, err, system_category())
     }
 }
 
@@ -242,7 +242,7 @@ std::size_t convert_to_utf8(const wchar_t * in, std::size_t size,
         if (*from  > max_wchar) {
             from_next = from;
             to_next = to;
-            ec.assign(error::invalid_character, error::get_utf8_category());
+            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::get_utf8_category())
             return 0u;
         }
 
@@ -270,7 +270,7 @@ std::size_t convert_to_utf8(const wchar_t * in, std::size_t size,
         if (to == to_end && i != cont_octet_count) {
             from_next = from;
             to_next = to - (i + 1);
-            ec.assign(error::insufficient_buffer, error::get_utf8_category());
+            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
             return 0u;
         }
         ++from;
@@ -280,7 +280,7 @@ std::size_t convert_to_utf8(const wchar_t * in, std::size_t size,
 
     // Were we done or did we run out of destination space
     if (from != from_end)
-        ec.assign(error::insufficient_buffer, error::get_utf8_category());
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
 
     return to_next - out;
 }
@@ -315,7 +315,7 @@ std::size_t convert_to_wide(const  char   * in, std::size_t size,
         if (invalid_leading_octet(*from)) {
             from_next = from;
             to_next = to;
-            ec.assign(error::invalid_character, error::get_utf8_category());
+            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::get_utf8_category())
             return 0u;
         }
 
@@ -339,7 +339,7 @@ std::size_t convert_to_wide(const  char   * in, std::size_t size,
             if (invalid_continuing_octet(*from)) {
                 from_next = from;
                 to_next = to;
-                ec.assign(error::invalid_character, error::get_utf8_category());
+                BOOST_PROCESS_V2_ASSIGN_EC(ec, error::invalid_character, error::get_utf8_category())
                 return 0u;
             }
 
@@ -356,7 +356,7 @@ std::size_t convert_to_wide(const  char   * in, std::size_t size,
             // rewind "from" to before the current character translation
             from_next = from - (i + 1);
             to_next = to;
-            ec.assign(error::insufficient_buffer, error::get_utf8_category());
+            BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
             return 0u;
         }
         *to++ = ucs_result;
@@ -365,7 +365,7 @@ std::size_t convert_to_wide(const  char   * in, std::size_t size,
     to_next = to;
 
     if (from != from_end)
-        ec.assign(error::insufficient_buffer, error::get_utf8_category());
+        BOOST_PROCESS_V2_ASSIGN_EC(ec, error::insufficient_buffer, error::get_utf8_category())
 
     return to_next - out;
 }

diff --git a/include/boost/process/v2/detail/last_error.hpp b/include/boost/process/v2/detail/last_error.hpp
@@ -9,14 +9,13 @@
 
 BOOST_PROCESS_V2_BEGIN_NAMESPACE
 
-namespace detail {
+namespace detail
+{
 
 BOOST_PROCESS_V2_DECL error_code get_last_error();
-BOOST_PROCESS_V2_DECL void throw_last_error();
-BOOST_PROCESS_V2_DECL void throw_last_error(const char * msg);
-BOOST_PROCESS_V2_DECL void throw_last_error(const std::string & msg);
 
 }
+
 BOOST_PROCESS_V2_END_NAMESPACE
 
 #if defined(BOOST_PROCESS_V2_HEADER_ONLY)

diff --git a/include/boost/process/v2/exit_code.hpp b/include/boost/process/v2/exit_code.hpp
@@ -148,7 +148,7 @@ struct code_as_error_handler
   void operator()(error_code ec, native_exit_code_type code)
   {
     if (!ec)
-      ec.assign(code, category);
+      BOOST_PROCESS_V2_ASSIGN_EC(ec, code, category)
     std::move(handler_)(ec);
   }