iox-eclipse-iceoryx#33 adding stub functions so that windows at least compiles; semaphore implemented

Signed-off-by: Christian Eltzschig <[email protected]>

Author: elfenpiff

iceoryx_utils/include/iceoryx_utils/fixed_string/string100.hpp

@@ -57,7 +57,7 @@ class CString100
     // >0  the first character that does not match has a greater value in str1 than in str2
     int32_t compare(const CString100& str2) const;
 
-    uint capacity() const;
+    unsigned int capacity() const;
 
     const char* to_cstring() const;
 
@@ -87,4 +87,3 @@ inline std::ostream& operator<<(std::ostream& stream, const iox::cxx::CString100
     stream << string.to_cstring();
     return stream;
 }
-

iceoryx_utils/include/iceoryx_utils/internal/concurrent/trigger_queue.hpp

@@ -14,10 +14,11 @@
 
 #pragma once
 
-#include "iceoryx_utils/internal/concurrent/smart_lock.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"
+#include "iceoryx_utils/internal/concurrent/smart_lock.hpp"
 #include "iceoryx_utils/posix_wrapper/semaphore.hpp"
 
+
 #include <cstdint>
 #include <queue>
 
@@ -93,10 +94,7 @@ class TriggerQueue
     /// methods which can be autogenerated by the compiler, ctor, dtor, copy,
     /// move) we check CAPACITY > 0 by declaring a member variable via a
     /// lambda which itselfs contains the check.
-    bool compileTimeCheck = []() {
-        static_assert(CAPACITY > 0, "The trigger queue must have at least one element!");
-        return true;
-    };
+    static_assert(CAPACITY > 0, "The trigger queue must have at least one element!");
 
   public:
     /// @todo replace this with a multi push / multi pop lockfree fifo
@@ -168,4 +166,3 @@ class TriggerQueue
 } // namespace iox
 
 #include "iceoryx_utils/internal/concurrent/trigger_queue.inl"
-

iceoryx_utils/include/iceoryx_utils/internal/posix_wrapper/posix_access_rights.hpp

@@ -17,6 +17,8 @@
 #include "iceoryx_utils/cxx/optional.hpp"
 #include "iceoryx_utils/cxx/vector.hpp"
 
+#include "iceoryx_utils/platform/types.hpp"
+
 #include <string>
 
 namespace iox

iceoryx_utils/platform/linux/include/iceoryx_utils/platform/platform-correction.hpp

@@ -0,0 +1,15 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once

iceoryx_utils/platform/mac/include/iceoryx_utils/platform/platform-correction.hpp

@@ -0,0 +1,15 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once

iceoryx_utils/platform/qnx/include/iceoryx_utils/platform/platform-correction.hpp

@@ -0,0 +1,15 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once

iceoryx_utils/platform/win/include/iceoryx_utils/platform/acl.hpp

@@ -21,7 +21,60 @@
 #define ACL_OTHER 4
 #define ACL_READ 5
 #define ACL_WRITE 6
+#define ACL_MASK 7
 
-using acl_t = int;
+struct __acl_ext
+{
+};
+
+using acl_t = struct __acl_ext*;
 using acl_permset_t = int;
 using acl_perm_t = int;
+using acl_entry_t = int;
+using acl_tag_t = int;
+
+inline int acl_valid(acl_t acl)
+{
+    return 0;
+}
+
+inline int acl_set_fd(int fd, acl_t acl)
+{
+    return 0;
+}
+
+inline acl_t acl_init(int count)
+{
+    static struct __acl_ext stub;
+    return &stub;
+}
+
+inline int acl_free(void*)
+{
+    return 0;
+}
+
+inline int acl_create_entry(acl_t* acl_p, acl_entry_t* entry_p)
+{
+    return 0;
+}
+
+inline int acl_set_tag_type(acl_entry_t entry_d, acl_tag_t tag_type)
+{
+    return 0;
+}
+
+inline int acl_set_qualifier(acl_entry_t entry_d, const void* qualifier_p)
+{
+    return 0;
+}
+
+inline int acl_get_permset(acl_entry_t entry_d, acl_permset_t* permset_p)
+{
+    return 0;
+}
+
+int acl_add_perm(acl_permset_t permset_d, acl_perm_t perm)
+{
+    return 0;
+}

iceoryx_utils/platform/win/include/iceoryx_utils/platform/platform-correction.hpp

@@ -0,0 +1,17 @@
+// Copyright (c) 2020 by Robert Bosch GmbH. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#define __PRETTY_FUNCTION__ __FUNCSIG__

iceoryx_utils/platform/win/include/iceoryx_utils/platform/pthread.hpp

@@ -16,6 +16,11 @@
 
 #include <thread>
 
+#define PTHREAD_PROCESS_SHARED 0
+#define PTHREAD_MUTEX_RECURSIVE_NP 1
+#define PTHREAD_MUTEX_FAST_NP 2
+#define PTHREAD_PRIO_NONE 3
+
 using pthread_mutex_t = int;
 using pthread_mutexattr_t = int;
 using pthread_t = std::thread::native_handle_type;
@@ -24,3 +29,53 @@ inline int pthread_setname_np(pthread_t thread, const char* name)
 {
     return 0;
 }
+
+inline int pthread_mutexattr_destroy(pthread_mutexattr_t* attr)
+{
+    return 0;
+}
+
+inline int pthread_mutexattr_init(pthread_mutexattr_t* attr)
+{
+    return 0;
+}
+
+inline int pthread_mutexattr_setpshared(pthread_mutexattr_t* attr, int pshared)
+{
+    return 0;
+}
+
+inline int pthread_mutexattr_settype(pthread_mutexattr_t* attr, int type)
+{
+    return 0;
+}
+
+inline int pthread_mutexattr_setprotocol(pthread_mutexattr_t* attr, int protocol)
+{
+    return 0;
+}
+
+inline int pthread_mutex_destroy(pthread_mutex_t* mutex)
+{
+    return 0;
+}
+
+inline int pthread_mutex_init(pthread_mutex_t* mutex, const pthread_mutexattr_t* attr)
+{
+    return 0;
+}
+
+inline int pthread_mutex_lock(pthread_mutex_t* mutex)
+{
+    return 0;
+}
+
+inline int pthread_mutex_trylock(pthread_mutex_t* mutex)
+{
+    return 0;
+}
+
+inline int pthread_mutex_unlock(pthread_mutex_t* mutex)
+{
+    return 0;
+}

iceoryx_utils/platform/win/include/iceoryx_utils/platform/semaphore.hpp

@@ -16,18 +16,20 @@
 
 #include "iceoryx_utils/platform/types.hpp"
 
+#include <cstdlib>
 #include <stdio.h>
+#include <type_traits>
 #include <windows.h>
 
 #define SEM_FAILED 0
 
-using sem_t = HANDLE;
+using sem_t = PVOID;
 static constexpr LONG MAX_SEMAPHORE_VALUE = LONG_MAX;
+static constexpr int MAX_SEMAPHORE_NAME_LENGTH = 128;
 
 inline int sem_getvalue(sem_t* sem, int* sval)
 {
-    static_assert(false, "Not available for Windows");
-    return 0;
+    return -1;
 }
 
 inline int sem_post(sem_t* sem)
@@ -87,7 +89,9 @@ inline int sem_init(sem_t* sem, int pshared, unsigned int value)
 
 inline sem_t* sem_open(const char* name, int oflag, mode_t mode, unsigned int value)
 {
-    return OpenSemaphoreW(0, false, name);
+    wchar_t semaphoreName[MAX_SEMAPHORE_NAME_LENGTH];
+    mbstowcs(semaphoreName, name, MAX_SEMAPHORE_NAME_LENGTH);
+    return static_cast<sem_t*>(OpenSemaphoreW(0, false, semaphoreName));
 }
 
 inline int sem_unlink(const char* name)

iceoryx_utils/platform/win/include/iceoryx_utils/platform/stat.hpp

@@ -20,3 +20,4 @@
 #define S_IWGRP 3
 #define S_IROTH 4
 #define S_IWOTH 5
+#define O_NONBLOCK 6

iceoryx_utils/platform/win/include/iceoryx_utils/platform/time.hpp

@@ -14,10 +14,11 @@
 
 #pragma once
 
+#include <time.h>
+
 #define CLOCK_REALTIME 0
 #define CLOCK_MONOTONIC 01
 
-// using time_t      = int;
 using suseconds_t = int;
 using timer_t = void*;
 using clockid_t = int;
@@ -28,12 +29,6 @@ struct timeval
     suseconds_t tv_usec;
 };
 
-// struct timespec
-//{
-//    time_t tv_sec;
-//    long   tv_nsec;
-//};
-
 struct itimerspec
 {
     timespec it_interval;

iceoryx_utils/platform/win/include/iceoryx_utils/platform/types.hpp

@@ -23,3 +23,8 @@ using nlink_t = int;
 using blksize_t = int;
 using blkcnt_t = int;
 // using off_t   = int;
+
+mode_t umask(mode_t mask)
+{
+    return mode_t();
+}

iceoryx_utils/source/concurrent/locked_loffli.cpp

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "iceoryx_utils/internal/concurrent/locked_loffli.hpp"
+#include "iceoryx_utils/platform/platform-correction.hpp"
 
 #include <cassert>
 

iceoryx_utils/source/concurrent/loffli.cpp

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "iceoryx_utils/internal/concurrent/loffli.hpp"
+#include "iceoryx_utils/platform/platform-correction.hpp"
 
 #include <cassert>
 

iceoryx_utils/source/file_reader/file_reader.cpp

@@ -14,6 +14,8 @@
 
 #include "iceoryx_utils/internal/file_reader/file_reader.hpp"
 
+#include <string>
+
 namespace iox
 {
 namespace cxx

iceoryx_utils/source/fixed_string/string100.cpp

@@ -100,7 +100,7 @@ int32_t CString100::compare(const CString100& str2) const
     return strncmp(m_string_vector.data(), str2.m_string_vector.data(), MaxStringSize);
 }
 
-uint CString100::capacity() const
+unsigned int CString100::capacity() const
 {
     return MaxStringSize;
 }