Added a small project for generic network errors.

glynos · glynos · commit d68fb579b844 · 2013-12-02T20:51:36.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -157,6 +157,7 @@ endif(DOXYGEN_FOUND)
 if(CPP-NETLIB_BUILD_SINGLE_LIB)
   include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/config/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/error/src
     ${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src
     ${CMAKE_CURRENT_SOURCE_DIR}/http/src
     ${CMAKE_CURRENT_SOURCE_DIR}/logging/src
@@ -169,6 +170,7 @@ endif()
 add_subdirectory(uri)
 #add_subdirectory(message)
 add_subdirectory(logging)
+add_subdirectory(error)
 #add_subdirectory(concurrency)
 add_subdirectory(http)
 #add_subdirectory(mime)
@@ -182,7 +184,7 @@ if(CPP-NETLIB_BUILD_SINGLE_LIB)
     ${CPP-NETLIB_MESSAGE_SRCS}
     ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS}
     ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS}
-    ${CPP-NETLIB_LoOGGING_SRCS}
+    ${CPP-NETLIB_LOGGING_SRCS}
     ${CPP-NETLIB_HTTP_CLIENT_SRCS}
     ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS}
     ${CPP-NETLIB_HTTP_SERVER_SRCS}
diff --git a/concurrency/test/thread_pool_test.cpp b/concurrency/test/thread_pool_test.cpp
@@ -8,7 +8,6 @@
 
 #include <gtest/gtest.h>
 #include <network/concurrency/thread_pool.hpp>
-// #include <boost/bind.hpp>
 #include <functional>
 
 using network::concurrency::thread_pool;
@@ -42,5 +41,5 @@ TEST(concurrency_test, post_work) {
     ASSERT_NO_THROW(pool.post(std::bind(&foo::bar, &instance, 2)));
     // require that pool is destroyed here, RAII baby
   }
-  ASSERT_EQ(instance.val(), 3);
+  ASSERT_EQ(3, instance.val());
 }
diff --git a/error/CMakeLists.txt b/error/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) Glyn Matthews 2013.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+add_subdirectory(src)
+
+if(CPP-NETLIB_BUILD_TESTS)
+  enable_testing()
+  add_subdirectory(test)
+endif(CPP-NETLIB_BUILD_TESTS)
+
+# propagate sources to parent directory for one-lib-build
+set(CPP-NETLIB_ERROR_SRCS ${CPP-NETLIB_ERROR_SRCS} PARENT_SCOPE)
diff --git a/error/src/CMakeLists.txt b/error/src/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) Glyn Matthews 2013.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+include_directories(${CPP-NETLIB_SOURCE_DIR}/error/src)
+
+set(CPP-NETLIB_ERROR_SRCS
+    error.cpp)
+
+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
+  add_library(network_error ${CPP-NETLIB_ERROR_SRCS})
+endif()
+
+# prepend current directory to make paths absolute
+prependToElements( "${CMAKE_CURRENT_SOURCE_DIR}/"
+    CPP-NETLIB_ERROR_SRCS )
+
+# propagate sources to parent directory for one-lib-build
+set(CPP-NETLIB_ERROR_SRCS ${CPP-NETLIB_ERROR_SRCS} PARENT_SCOPE)
diff --git a/error/src/error.cpp b/error/src/error.cpp
@@ -0,0 +1,42 @@
+// Copyright (C) 2013 by Glyn Matthews
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <network/error.hpp>
+#include <cstring>
+
+namespace network {
+
+  class network_category_impl : public std::error_category {
+
+  public:
+
+    network_category_impl() = default;
+
+    virtual ~network_category_impl() noexcept;
+
+    virtual const char *name() const noexcept;
+
+    virtual std::string message(int ev) const;
+
+  };
+
+  network_category_impl::~network_category_impl() noexcept {
+
+  }
+
+  const char *network_category_impl::name() const noexcept {
+    static const char name[] = "network_error";
+    return name;
+  }
+
+  std::string network_category_impl::message(int ev) const {
+    return std::strerror(ev);
+  }
+
+  const std::error_category &network_category() {
+    static network_category_impl category;
+    return category;
+  }
+} // namespace network
diff --git a/error/src/network/error.hpp b/error/src/network/error.hpp
@@ -0,0 +1,24 @@
+// Copyright (C) 2013 by Glyn Matthews
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef NETWORK_ERROR_INC
+#define NETWORK_ERROR_INC
+
+/**
+ * \file
+ * \brief Contains a set of error classes and exceptions for
+ *        network connections.
+ */
+
+#include <system_error>
+
+namespace network {
+  /**
+   * \brief Gets the error category for network errors.
+   */
+  const std::error_category &network_category();
+} // namespace network
+
+#endif // NETWORK_ERROR_INC
diff --git a/error/test/CMakeLists.txt b/error/test/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Copyright (c) Glyn Matthews 2013.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+include_directories(${CPP-NETLIB_SOURCE_DIR}/error/src
+  ${GTEST_INCLUDE_DIRS}
+  ${CPP-NETLIB_SOURCE_DIR}
+)
+
+if (CPP-NETLIB_BUILD_TESTS)
+  add_executable(cpp-netlib-error_test error_test.cpp)
+  target_link_libraries(cpp-netlib-error_test
+    ${link_cppnetlib_lib}
+    network_error
+    ${Boost_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT})
+  set_target_properties(cpp-netlib-error_test PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+  add_test(cpp-netlib-error_test
+    ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-error_test)
+endif()
diff --git a/error/test/error_test.cpp b/error/test/error_test.cpp
@@ -0,0 +1,13 @@
+// Copyright (c) Glyn Matthews 2013.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <gtest/gtest.h>
+#include <network/error.hpp>
+#include <cerrno>
+
+TEST(error_test, system_error) {
+  std::system_error error(EPIPE, network::network_category());
+  ASSERT_EQ(EPIPE, error.code().value());
+}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`#include <gtest/gtest.h>`
`10`	`10`	`#include <network/concurrency/thread_pool.hpp>`
`11`		`-// #include <boost/bind.hpp>`
`12`	`11`	`#include <functional>`
`13`	`12`
`14`	`13`	`using network::concurrency::thread_pool;`
`@@ -42,5 +41,5 @@ TEST(concurrency_test, post_work) {`
`42`	`41`	`ASSERT_NO_THROW(pool.post(std::bind(&foo::bar, &instance, 2)));`
`43`	`42`	`// require that pool is destroyed here, RAII baby`
`44`	`43`	`}`
`45`		`- ASSERT_EQ(instance.val(), 3);`
	`44`	`+ ASSERT_EQ(3, instance.val());`
`46`	`45`	`}`