aboutsummaryrefslogtreecommitdiffstats
path: root/libtransport/src/hicn/transport/utils
diff options
context:
space:
mode:
authorAngelo Mantellini <manangel@cisco.com>2019-01-30 12:11:34 +0100
committerAngelo Mantellini <manangel@cisco.com>2019-01-30 15:23:44 +0100
commite5145b878f9de35676085409878a66899d2ee4f2 (patch)
tree177f77810901921ee03d1d3b850600c5f2cd1ef9 /libtransport/src/hicn/transport/utils
parent30061551cd39c9f30280bfa0cf3cc909f4fac015 (diff)
[HICN-18] first commit of libtransport for windows
Change-Id: I3a43b22194aa13ae5de1746e3d4bd9a275070261 Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/utils')
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/CMakeLists.txt0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/array.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/branch_prediction.h7
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/content_store.cc0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/content_store.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/conversions.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/crypto_hash.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/crypto_hash_type.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/crypto_hasher.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/crypto_suite.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/daemonizator.cc0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/daemonizator.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/deadline_timer.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/endianess.h5
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/epoll_event_reactor.cc0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/epoll_event_reactor.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/event_reactor.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/event_thread.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/fd_deadline_timer.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/hash.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/identity.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/key_id.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/linux.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/literals.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/membuf.cc3
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/membuf.h3
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/min_filter.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/object_pool.h4
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/ring_buffer.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/sharable_vector.h0
-rw-r--r--libtransport/src/hicn/transport/utils/signer.cc2
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/signer.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/socket.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/spinlock.h2
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/stream_buffer.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/string_tokenizer.cc0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/string_tokenizer.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/test.h0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/uri.cc0
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/uri.h0
-rw-r--r--libtransport/src/hicn/transport/utils/verifier.cc2
-rw-r--r--[-rwxr-xr-x]libtransport/src/hicn/transport/utils/verifier.h0
42 files changed, 22 insertions, 6 deletions
diff --git a/libtransport/src/hicn/transport/utils/CMakeLists.txt b/libtransport/src/hicn/transport/utils/CMakeLists.txt
index 088fb5862..088fb5862 100755..100644
--- a/libtransport/src/hicn/transport/utils/CMakeLists.txt
+++ b/libtransport/src/hicn/transport/utils/CMakeLists.txt
diff --git a/libtransport/src/hicn/transport/utils/array.h b/libtransport/src/hicn/transport/utils/array.h
index a3a66e498..a3a66e498 100755..100644
--- a/libtransport/src/hicn/transport/utils/array.h
+++ b/libtransport/src/hicn/transport/utils/array.h
diff --git a/libtransport/src/hicn/transport/utils/branch_prediction.h b/libtransport/src/hicn/transport/utils/branch_prediction.h
index b12282fe8..8cbfaca76 100755..100644
--- a/libtransport/src/hicn/transport/utils/branch_prediction.h
+++ b/libtransport/src/hicn/transport/utils/branch_prediction.h
@@ -18,5 +18,10 @@
#undef TRANSPORT_EXPECT_TRUE
#undef TRANSPORT_EXPECT_FALSE
+#ifndef _WIN32
#define TRANSPORT_EXPECT_TRUE(x) __builtin_expect((x), 1)
-#define TRANSPORT_EXPECT_FALSE(x) __builtin_expect((x), 0) \ No newline at end of file
+#define TRANSPORT_EXPECT_FALSE(x) __builtin_expect((x), 0)
+#else
+#define TRANSPORT_EXPECT_TRUE(x) (x)
+#define TRANSPORT_EXPECT_FALSE(x) (x)
+#endif \ No newline at end of file
diff --git a/libtransport/src/hicn/transport/utils/content_store.cc b/libtransport/src/hicn/transport/utils/content_store.cc
index 4c7637dad..4c7637dad 100755..100644
--- a/libtransport/src/hicn/transport/utils/content_store.cc
+++ b/libtransport/src/hicn/transport/utils/content_store.cc
diff --git a/libtransport/src/hicn/transport/utils/content_store.h b/libtransport/src/hicn/transport/utils/content_store.h
index ab4963fff..ab4963fff 100755..100644
--- a/libtransport/src/hicn/transport/utils/content_store.h
+++ b/libtransport/src/hicn/transport/utils/content_store.h
diff --git a/libtransport/src/hicn/transport/utils/conversions.h b/libtransport/src/hicn/transport/utils/conversions.h
index 24b529206..24b529206 100755..100644
--- a/libtransport/src/hicn/transport/utils/conversions.h
+++ b/libtransport/src/hicn/transport/utils/conversions.h
diff --git a/libtransport/src/hicn/transport/utils/crypto_hash.h b/libtransport/src/hicn/transport/utils/crypto_hash.h
index 0c15c8bda..0c15c8bda 100755..100644
--- a/libtransport/src/hicn/transport/utils/crypto_hash.h
+++ b/libtransport/src/hicn/transport/utils/crypto_hash.h
diff --git a/libtransport/src/hicn/transport/utils/crypto_hash_type.h b/libtransport/src/hicn/transport/utils/crypto_hash_type.h
index b7597e208..b7597e208 100755..100644
--- a/libtransport/src/hicn/transport/utils/crypto_hash_type.h
+++ b/libtransport/src/hicn/transport/utils/crypto_hash_type.h
diff --git a/libtransport/src/hicn/transport/utils/crypto_hasher.h b/libtransport/src/hicn/transport/utils/crypto_hasher.h
index c34a26fac..c34a26fac 100755..100644
--- a/libtransport/src/hicn/transport/utils/crypto_hasher.h
+++ b/libtransport/src/hicn/transport/utils/crypto_hasher.h
diff --git a/libtransport/src/hicn/transport/utils/crypto_suite.h b/libtransport/src/hicn/transport/utils/crypto_suite.h
index 8ae32b846..8ae32b846 100755..100644
--- a/libtransport/src/hicn/transport/utils/crypto_suite.h
+++ b/libtransport/src/hicn/transport/utils/crypto_suite.h
diff --git a/libtransport/src/hicn/transport/utils/daemonizator.cc b/libtransport/src/hicn/transport/utils/daemonizator.cc
index d9b3109af..d9b3109af 100755..100644
--- a/libtransport/src/hicn/transport/utils/daemonizator.cc
+++ b/libtransport/src/hicn/transport/utils/daemonizator.cc
diff --git a/libtransport/src/hicn/transport/utils/daemonizator.h b/libtransport/src/hicn/transport/utils/daemonizator.h
index a21ce8a7b..a21ce8a7b 100755..100644
--- a/libtransport/src/hicn/transport/utils/daemonizator.h
+++ b/libtransport/src/hicn/transport/utils/daemonizator.h
diff --git a/libtransport/src/hicn/transport/utils/deadline_timer.h b/libtransport/src/hicn/transport/utils/deadline_timer.h
index 61f906141..61f906141 100755..100644
--- a/libtransport/src/hicn/transport/utils/deadline_timer.h
+++ b/libtransport/src/hicn/transport/utils/deadline_timer.h
diff --git a/libtransport/src/hicn/transport/utils/endianess.h b/libtransport/src/hicn/transport/utils/endianess.h
index a3ec21c90..d86e764ab 100755..100644
--- a/libtransport/src/hicn/transport/utils/endianess.h
+++ b/libtransport/src/hicn/transport/utils/endianess.h
@@ -17,7 +17,12 @@
#include <hicn/transport/portability/portability.h>
+#ifndef _WIN32
#include <arpa/inet.h>
+#else
+#include <hicn/transport/portability/win_portability.h>
+#endif
+
#include <cstring>
namespace utils {
diff --git a/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc b/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
index 81b471857..81b471857 100755..100644
--- a/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
+++ b/libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
diff --git a/libtransport/src/hicn/transport/utils/epoll_event_reactor.h b/libtransport/src/hicn/transport/utils/epoll_event_reactor.h
index bb4db3ee7..bb4db3ee7 100755..100644
--- a/libtransport/src/hicn/transport/utils/epoll_event_reactor.h
+++ b/libtransport/src/hicn/transport/utils/epoll_event_reactor.h
diff --git a/libtransport/src/hicn/transport/utils/event_reactor.h b/libtransport/src/hicn/transport/utils/event_reactor.h
index 4f8b58296..4f8b58296 100755..100644
--- a/libtransport/src/hicn/transport/utils/event_reactor.h
+++ b/libtransport/src/hicn/transport/utils/event_reactor.h
diff --git a/libtransport/src/hicn/transport/utils/event_thread.h b/libtransport/src/hicn/transport/utils/event_thread.h
index 3bf08c94b..3bf08c94b 100755..100644
--- a/libtransport/src/hicn/transport/utils/event_thread.h
+++ b/libtransport/src/hicn/transport/utils/event_thread.h
diff --git a/libtransport/src/hicn/transport/utils/fd_deadline_timer.h b/libtransport/src/hicn/transport/utils/fd_deadline_timer.h
index 3ed4590bc..3ed4590bc 100755..100644
--- a/libtransport/src/hicn/transport/utils/fd_deadline_timer.h
+++ b/libtransport/src/hicn/transport/utils/fd_deadline_timer.h
diff --git a/libtransport/src/hicn/transport/utils/hash.h b/libtransport/src/hicn/transport/utils/hash.h
index 6815ca4bf..6815ca4bf 100755..100644
--- a/libtransport/src/hicn/transport/utils/hash.h
+++ b/libtransport/src/hicn/transport/utils/hash.h
diff --git a/libtransport/src/hicn/transport/utils/identity.h b/libtransport/src/hicn/transport/utils/identity.h
index 018842ee3..018842ee3 100755..100644
--- a/libtransport/src/hicn/transport/utils/identity.h
+++ b/libtransport/src/hicn/transport/utils/identity.h
diff --git a/libtransport/src/hicn/transport/utils/key_id.h b/libtransport/src/hicn/transport/utils/key_id.h
index d67b73d7a..d67b73d7a 100755..100644
--- a/libtransport/src/hicn/transport/utils/key_id.h
+++ b/libtransport/src/hicn/transport/utils/key_id.h
diff --git a/libtransport/src/hicn/transport/utils/linux.h b/libtransport/src/hicn/transport/utils/linux.h
index 5820528e1..5820528e1 100755..100644
--- a/libtransport/src/hicn/transport/utils/linux.h
+++ b/libtransport/src/hicn/transport/utils/linux.h
diff --git a/libtransport/src/hicn/transport/utils/literals.h b/libtransport/src/hicn/transport/utils/literals.h
index bd00e0a58..bd00e0a58 100755..100644
--- a/libtransport/src/hicn/transport/utils/literals.h
+++ b/libtransport/src/hicn/transport/utils/literals.h
diff --git a/libtransport/src/hicn/transport/utils/membuf.cc b/libtransport/src/hicn/transport/utils/membuf.cc
index 0ab1a6044..e75e85b35 100755..100644
--- a/libtransport/src/hicn/transport/utils/membuf.cc
+++ b/libtransport/src/hicn/transport/utils/membuf.cc
@@ -18,6 +18,9 @@
* The code in this file if adapated from the IOBuf of folly:
* https://github.com/facebook/folly/blob/master/folly/io/IOBuf.h
*/
+#ifdef _WIN32
+#include <hicn/transport/portability/win_portability.h>
+#endif
#include <hicn/transport/utils/membuf.h>
diff --git a/libtransport/src/hicn/transport/utils/membuf.h b/libtransport/src/hicn/transport/utils/membuf.h
index 944237e2b..5a10d4182 100755..100644
--- a/libtransport/src/hicn/transport/utils/membuf.h
+++ b/libtransport/src/hicn/transport/utils/membuf.h
@@ -35,8 +35,9 @@
#include <type_traits>
#include <vector>
-// Ignore shadowing warnings within this file, so includers can use -Wshadow.
+#ifndef _WIN32
TRANSPORT_GNU_DISABLE_WARNING("-Wshadow")
+#endif
namespace utils {
diff --git a/libtransport/src/hicn/transport/utils/min_filter.h b/libtransport/src/hicn/transport/utils/min_filter.h
index acb081edc..acb081edc 100755..100644
--- a/libtransport/src/hicn/transport/utils/min_filter.h
+++ b/libtransport/src/hicn/transport/utils/min_filter.h
diff --git a/libtransport/src/hicn/transport/utils/object_pool.h b/libtransport/src/hicn/transport/utils/object_pool.h
index c369f7e12..9fda214cd 100755..100644
--- a/libtransport/src/hicn/transport/utils/object_pool.h
+++ b/libtransport/src/hicn/transport/utils/object_pool.h
@@ -47,9 +47,7 @@ class ObjectPool {
ObjectPool() : destructor_(false) {}
- ~ObjectPool() {
- destructor_ = true;
- }
+ ~ObjectPool() { destructor_ = true; }
std::pair<bool, Ptr> get() {
if (object_pool_.empty()) {
diff --git a/libtransport/src/hicn/transport/utils/ring_buffer.h b/libtransport/src/hicn/transport/utils/ring_buffer.h
index 52bcd81c4..52bcd81c4 100755..100644
--- a/libtransport/src/hicn/transport/utils/ring_buffer.h
+++ b/libtransport/src/hicn/transport/utils/ring_buffer.h
diff --git a/libtransport/src/hicn/transport/utils/sharable_vector.h b/libtransport/src/hicn/transport/utils/sharable_vector.h
index 31adff1ad..31adff1ad 100755..100644
--- a/libtransport/src/hicn/transport/utils/sharable_vector.h
+++ b/libtransport/src/hicn/transport/utils/sharable_vector.h
diff --git a/libtransport/src/hicn/transport/utils/signer.cc b/libtransport/src/hicn/transport/utils/signer.cc
index 579b08aff..005236c2e 100644
--- a/libtransport/src/hicn/transport/utils/signer.cc
+++ b/libtransport/src/hicn/transport/utils/signer.cc
@@ -22,7 +22,9 @@
#include <hicn/transport/utils/signer.h>
extern "C" {
+#ifndef _WIN32
TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat")
+#endif
#include <hicn/hicn.h>
#include <parc/security/parc_PublicKeySigner.h>
#include <parc/security/parc_Security.h>
diff --git a/libtransport/src/hicn/transport/utils/signer.h b/libtransport/src/hicn/transport/utils/signer.h
index 7b54b63c8..7b54b63c8 100755..100644
--- a/libtransport/src/hicn/transport/utils/signer.h
+++ b/libtransport/src/hicn/transport/utils/signer.h
diff --git a/libtransport/src/hicn/transport/utils/socket.h b/libtransport/src/hicn/transport/utils/socket.h
index ab8578f91..ab8578f91 100755..100644
--- a/libtransport/src/hicn/transport/utils/socket.h
+++ b/libtransport/src/hicn/transport/utils/socket.h
diff --git a/libtransport/src/hicn/transport/utils/spinlock.h b/libtransport/src/hicn/transport/utils/spinlock.h
index 33e5cda85..009a94454 100755..100644
--- a/libtransport/src/hicn/transport/utils/spinlock.h
+++ b/libtransport/src/hicn/transport/utils/spinlock.h
@@ -35,7 +35,7 @@ class SpinLock : private std::atomic_flag {
SpinLock& spin_lock_;
};
- SpinLock() : std::atomic_flag(false) {}
+ SpinLock() { clear(); }
void lock() {
// busy-wait
diff --git a/libtransport/src/hicn/transport/utils/stream_buffer.h b/libtransport/src/hicn/transport/utils/stream_buffer.h
index adfb696f2..adfb696f2 100755..100644
--- a/libtransport/src/hicn/transport/utils/stream_buffer.h
+++ b/libtransport/src/hicn/transport/utils/stream_buffer.h
diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.cc b/libtransport/src/hicn/transport/utils/string_tokenizer.cc
index 9d1911080..9d1911080 100755..100644
--- a/libtransport/src/hicn/transport/utils/string_tokenizer.cc
+++ b/libtransport/src/hicn/transport/utils/string_tokenizer.cc
diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.h b/libtransport/src/hicn/transport/utils/string_tokenizer.h
index 36630eb58..36630eb58 100755..100644
--- a/libtransport/src/hicn/transport/utils/string_tokenizer.h
+++ b/libtransport/src/hicn/transport/utils/string_tokenizer.h
diff --git a/libtransport/src/hicn/transport/utils/test.h b/libtransport/src/hicn/transport/utils/test.h
index e3dd619ac..e3dd619ac 100755..100644
--- a/libtransport/src/hicn/transport/utils/test.h
+++ b/libtransport/src/hicn/transport/utils/test.h
diff --git a/libtransport/src/hicn/transport/utils/uri.cc b/libtransport/src/hicn/transport/utils/uri.cc
index 33eb8b45b..33eb8b45b 100755..100644
--- a/libtransport/src/hicn/transport/utils/uri.cc
+++ b/libtransport/src/hicn/transport/utils/uri.cc
diff --git a/libtransport/src/hicn/transport/utils/uri.h b/libtransport/src/hicn/transport/utils/uri.h
index 7c28e8552..7c28e8552 100755..100644
--- a/libtransport/src/hicn/transport/utils/uri.h
+++ b/libtransport/src/hicn/transport/utils/uri.h
diff --git a/libtransport/src/hicn/transport/utils/verifier.cc b/libtransport/src/hicn/transport/utils/verifier.cc
index 93efe063a..49cbe3b36 100644
--- a/libtransport/src/hicn/transport/utils/verifier.cc
+++ b/libtransport/src/hicn/transport/utils/verifier.cc
@@ -21,7 +21,9 @@
#include <hicn/transport/utils/verifier.h>
extern "C" {
+#ifndef _WIN32
TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat")
+#endif
#include <hicn/hicn.h>
#include <parc/security/parc_CertificateFactory.h>
#include <parc/security/parc_InMemoryVerifier.h>
diff --git a/libtransport/src/hicn/transport/utils/verifier.h b/libtransport/src/hicn/transport/utils/verifier.h
index 6313a7240..6313a7240 100755..100644
--- a/libtransport/src/hicn/transport/utils/verifier.h
+++ b/libtransport/src/hicn/transport/utils/verifier.h