From e5145b878f9de35676085409878a66899d2ee4f2 Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <manangel@cisco.com>
Date: Wed, 30 Jan 2019 12:11:34 +0100
Subject: [HICN-18] first commit of libtransport for windows

Change-Id: I3a43b22194aa13ae5de1746e3d4bd9a275070261
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
---
 libtransport/src/hicn/transport/utils/CMakeLists.txt         | 0
 libtransport/src/hicn/transport/utils/array.h                | 0
 libtransport/src/hicn/transport/utils/branch_prediction.h    | 7 ++++++-
 libtransport/src/hicn/transport/utils/content_store.cc       | 0
 libtransport/src/hicn/transport/utils/content_store.h        | 0
 libtransport/src/hicn/transport/utils/conversions.h          | 0
 libtransport/src/hicn/transport/utils/crypto_hash.h          | 0
 libtransport/src/hicn/transport/utils/crypto_hash_type.h     | 0
 libtransport/src/hicn/transport/utils/crypto_hasher.h        | 0
 libtransport/src/hicn/transport/utils/crypto_suite.h         | 0
 libtransport/src/hicn/transport/utils/daemonizator.cc        | 0
 libtransport/src/hicn/transport/utils/daemonizator.h         | 0
 libtransport/src/hicn/transport/utils/deadline_timer.h       | 0
 libtransport/src/hicn/transport/utils/endianess.h            | 5 +++++
 libtransport/src/hicn/transport/utils/epoll_event_reactor.cc | 0
 libtransport/src/hicn/transport/utils/epoll_event_reactor.h  | 0
 libtransport/src/hicn/transport/utils/event_reactor.h        | 0
 libtransport/src/hicn/transport/utils/event_thread.h         | 0
 libtransport/src/hicn/transport/utils/fd_deadline_timer.h    | 0
 libtransport/src/hicn/transport/utils/hash.h                 | 0
 libtransport/src/hicn/transport/utils/identity.h             | 0
 libtransport/src/hicn/transport/utils/key_id.h               | 0
 libtransport/src/hicn/transport/utils/linux.h                | 0
 libtransport/src/hicn/transport/utils/literals.h             | 0
 libtransport/src/hicn/transport/utils/membuf.cc              | 3 +++
 libtransport/src/hicn/transport/utils/membuf.h               | 3 ++-
 libtransport/src/hicn/transport/utils/min_filter.h           | 0
 libtransport/src/hicn/transport/utils/object_pool.h          | 4 +---
 libtransport/src/hicn/transport/utils/ring_buffer.h          | 0
 libtransport/src/hicn/transport/utils/sharable_vector.h      | 0
 libtransport/src/hicn/transport/utils/signer.cc              | 2 ++
 libtransport/src/hicn/transport/utils/signer.h               | 0
 libtransport/src/hicn/transport/utils/socket.h               | 0
 libtransport/src/hicn/transport/utils/spinlock.h             | 2 +-
 libtransport/src/hicn/transport/utils/stream_buffer.h        | 0
 libtransport/src/hicn/transport/utils/string_tokenizer.cc    | 0
 libtransport/src/hicn/transport/utils/string_tokenizer.h     | 0
 libtransport/src/hicn/transport/utils/test.h                 | 0
 libtransport/src/hicn/transport/utils/uri.cc                 | 0
 libtransport/src/hicn/transport/utils/uri.h                  | 0
 libtransport/src/hicn/transport/utils/verifier.cc            | 2 ++
 libtransport/src/hicn/transport/utils/verifier.h             | 0
 42 files changed, 22 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/CMakeLists.txt
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/array.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/branch_prediction.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/content_store.cc
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/content_store.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/conversions.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/crypto_hash.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/crypto_hash_type.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/crypto_hasher.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/crypto_suite.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/daemonizator.cc
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/daemonizator.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/deadline_timer.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/endianess.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/epoll_event_reactor.cc
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/epoll_event_reactor.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/event_reactor.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/event_thread.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/fd_deadline_timer.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/hash.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/identity.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/key_id.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/linux.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/literals.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/membuf.cc
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/membuf.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/min_filter.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/object_pool.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/ring_buffer.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/sharable_vector.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/signer.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/socket.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/spinlock.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/stream_buffer.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/string_tokenizer.cc
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/string_tokenizer.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/test.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/uri.cc
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/uri.h
 mode change 100755 => 100644 libtransport/src/hicn/transport/utils/verifier.h

(limited to 'libtransport/src/hicn/transport/utils')

diff --git a/libtransport/src/hicn/transport/utils/CMakeLists.txt b/libtransport/src/hicn/transport/utils/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/array.h b/libtransport/src/hicn/transport/utils/array.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/branch_prediction.h b/libtransport/src/hicn/transport/utils/branch_prediction.h
old mode 100755
new mode 100644
index b12282fe8..8cbfaca76
--- 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
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/content_store.h b/libtransport/src/hicn/transport/utils/content_store.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/conversions.h b/libtransport/src/hicn/transport/utils/conversions.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/crypto_hash.h b/libtransport/src/hicn/transport/utils/crypto_hash.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/crypto_hash_type.h b/libtransport/src/hicn/transport/utils/crypto_hash_type.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/crypto_hasher.h b/libtransport/src/hicn/transport/utils/crypto_hasher.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/crypto_suite.h b/libtransport/src/hicn/transport/utils/crypto_suite.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/daemonizator.cc b/libtransport/src/hicn/transport/utils/daemonizator.cc
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/daemonizator.h b/libtransport/src/hicn/transport/utils/daemonizator.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/deadline_timer.h b/libtransport/src/hicn/transport/utils/deadline_timer.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/endianess.h b/libtransport/src/hicn/transport/utils/endianess.h
old mode 100755
new mode 100644
index a3ec21c90..d86e764ab
--- 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
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/epoll_event_reactor.h b/libtransport/src/hicn/transport/utils/epoll_event_reactor.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/event_reactor.h b/libtransport/src/hicn/transport/utils/event_reactor.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/event_thread.h b/libtransport/src/hicn/transport/utils/event_thread.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/fd_deadline_timer.h b/libtransport/src/hicn/transport/utils/fd_deadline_timer.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/hash.h b/libtransport/src/hicn/transport/utils/hash.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/identity.h b/libtransport/src/hicn/transport/utils/identity.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/key_id.h b/libtransport/src/hicn/transport/utils/key_id.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/linux.h b/libtransport/src/hicn/transport/utils/linux.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/literals.h b/libtransport/src/hicn/transport/utils/literals.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/membuf.cc b/libtransport/src/hicn/transport/utils/membuf.cc
old mode 100755
new mode 100644
index 0ab1a6044..e75e85b35
--- 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
old mode 100755
new mode 100644
index 944237e2b..5a10d4182
--- 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
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/object_pool.h b/libtransport/src/hicn/transport/utils/object_pool.h
old mode 100755
new mode 100644
index c369f7e12..9fda214cd
--- 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
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/sharable_vector.h b/libtransport/src/hicn/transport/utils/sharable_vector.h
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/socket.h b/libtransport/src/hicn/transport/utils/socket.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/spinlock.h b/libtransport/src/hicn/transport/utils/spinlock.h
old mode 100755
new mode 100644
index 33e5cda85..009a94454
--- 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
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.cc b/libtransport/src/hicn/transport/utils/string_tokenizer.cc
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.h b/libtransport/src/hicn/transport/utils/string_tokenizer.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/test.h b/libtransport/src/hicn/transport/utils/test.h
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/uri.cc b/libtransport/src/hicn/transport/utils/uri.cc
old mode 100755
new mode 100644
diff --git a/libtransport/src/hicn/transport/utils/uri.h b/libtransport/src/hicn/transport/utils/uri.h
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
-- 
cgit 1.2.3-korg