Create waitset

.gitignore

@@ -102,3 +102,9 @@ ENV/
 
 # mypy
 .mypy_cache/
+/.project
+/.pydevproject
+/bit/bit.c
+/bit/bit.h
+/bit/helloworld.c
+/bit/helloworld.h

.travis.yml

@@ -1,12 +1,12 @@
 before_install:
-  - sudo apt install -y python3-pip build-essential cmake
+  - sudo apt install -y python3-pip build-essential cmake default-jdk maven
   - git clone https://github.com/eclipse-cyclonedds/cyclonedds /tmp/cyclonedds
-  - cd /tmp/cyclonedds && mkdir build && cd cmake --build . --target install
+  - cd /tmp/cyclonedds && mkdir build && cd build && cmake ..  && make && sudo make install && cd $TRAVIS_BUILD_DIR
 addons:
   apt:
     update: true
 
-language: python3
+language: python
 python:
   - "3.5"
   - "3.6"
@@ -16,10 +16,13 @@ python:
 install:
   - travis_retry pip3 install tox
   - pip install codecov jsonpickle idl_parser
+  - ./configure
+  - cp tests/example.idl /tmp/example.idl
+  - cp tests/helloworld.idl /tmp/helloworld.idl
 script:
   - tox
 cache:
   directories:
     - $HOME/.cache/pip
 after_success:
-- codecov
+- codecov

bit/CMakeLists.txt

@@ -1,7 +1,44 @@
 cmake_minimum_required(VERSION 3.7)
+project(dds-python)
 
 find_package(CycloneDDS)
 
-idlc_generate(ddsbit bit.idl)
-add_library(ddstubs SHARED dds_stubs.c)
-target_link_libraries(ddstubs ddsbit CycloneDDS::ddsc)
+#idlc_generate(ddsbit bit.idl)
+SET(outsources)
+
+SET(outsources bit)
+
+list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+message(" CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}")
+include(idlc_generate_macro)
+
+# find_program(idcl_generate dds_idlc /home/firas/cyclone/cyclonedds/bld/src/idlc)
+# 
+# if(NOT idcl_generate)
+#   message(FATAL_ERROR "Failed to find idlc code generator ")
+# else()
+#     message("Find idlc  code generator")
+# endif()
+
+# message (${idcl_generate})
+message (" outsources = ${outsources}")
+
+message ("${idcl_generate} -d ${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/${outsources}.idl")
+
+
+# ADD_CUSTOM_COMMAND (
+# OUTPUT ${outsource}.c ${outsources}.h 
+# COMMAND ${idcl_generate} ARGS -d ${CMAKE_CURRENT_SOURCE_DIR} -verbose ${CMAKE_CURRENT_BINARY_DIR}/bit.idl
+# COMMENT "Generating files in  ${CMAKE_CURRENT_SOURCE_DIR}  "
+# )
+idlc_generate_func(${CMAKE_CURRENT_SOURCE_DIR}/bit.idl)
+idlc_generate_func(${CMAKE_CURRENT_SOURCE_DIR}/../tests/helloworld.idl)
+
+add_library(ddstubs SHARED ${CMAKE_CURRENT_SOURCE_DIR}/dds_stubs.c)
+add_library(ddsbit SHARED ${CMAKE_CURRENT_SOURCE_DIR}/bit.c ${CMAKE_CURRENT_SOURCE_DIR}/bit.h )
+add_library(ddshelloworld SHARED ${CMAKE_CURRENT_SOURCE_DIR}/helloworld.c ${CMAKE_CURRENT_SOURCE_DIR}/helloworld.h )
+
+message("CMAKE_CURRENT_BINARY_DIR ==== ${CMAKE_CURRENT_BINARY_DIR} ")
+message("CMAKE_CURRENT_SOURCE_DIR ==== ${CMAKE_CURRENT_SOURCE_DIR} ")
+
+target_link_libraries(ddstubs ddsbit ddshelloworld CycloneDDS::ddsc)

bit/cmake/idlc_generate_macro.cmake

@@ -0,0 +1,81 @@
+#
+# Copyright(c) 2006 to 2018 ADLINK Technology Limited and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License
+# v. 1.0 which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+#
+
+
+
+#set(IDLC_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
+#set(IDLC "dds_idlc${EXTENSION}" CACHE STRING "")
+#mark_as_advanced(IDLC_DIR IDLC)
+
+#set(IDLC_SCRIPT_IN "${CMAKE_CURRENT_LIST_DIR}/dds_idlc${EXTENSION}.in")
+
+#configure_file(
+#    "${IDLC_SCRIPT_IN}" "${IDLC}"
+#    @ONLY
+#    NEWLINE_STYLE ${LINE_ENDINGS})
+#
+#if(NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows"))
+#    execute_process(COMMAND chmod +x "${IDLC_DIR}/${IDLC}")
+#endif()
+
+#add_custom_target(idlc ALL DEPENDS "${IDLC_JAR}")
+
+MACRO (idlc_generate_func idl_file)
+  message("idl_file: ${idl_file} ")
+
+  if(idl_file STREQUAL "")
+    message(FATAL_ERROR "idlc_generate called without any idl files")
+  endif()
+
+  if (NOT IDLC_ARGS)
+     set(IDLC_ARGS)
+  endif()
+
+  set(_dir "${CMAKE_CURRENT_BINARY_DIR}")
+  set(_sources)
+  set(_headers)
+
+  find_program(idcl_generate_full_path 
+                dds_idlc 
+                PATHS /tmp/cyclonedds/build/src/idlc)
+
+    if( idcl_generate_full_path STREQUAL "")
+        message(FATAL_ERROR "Failed to find idlc code generator ")
+    else()
+        message("${idcl_generate_full_path}: Found idlc  code generator")
+    endif()
+
+  foreach(FIL ${idl_file})
+    message("file to parse ${FIL} ")
+    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
+    get_filename_component(FIL_WE ${FIL} NAME_WE)
+
+    set(_source "${CMAKE_CURRENT_SOURCE_DIR}/${FIL_WE}.c")
+    set(_header "${CMAKE_CURRENT_SOURCE_DIR}/${FIL_WE}.h")
+
+    list(APPEND _sources "${_source}")
+    list(APPEND _headers "${_header}")
+
+    add_custom_command(
+      OUTPUT   "${_source}" "${_header}"
+      COMMAND  "${idcl_generate_full_path}"
+      ARGS     -d ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
+      COMMENT  "Running idlc on ${FIL}"
+      VERBATIM)
+  endforeach()
+
+  message("sources ${_sources}" )
+  message("headers ${_headers}" )
+
+  set_source_files_properties(${_sources} ${_headers} PROPERTIES GENERATED TRUE)
+
+endmacro()

cdds/__init__.py

@@ -1,10 +1,18 @@
 __author__ = 'Angelo Corsaro'
 
 from .runtime import Runtime
+from .policy import *
+from .entity import *
+from .waitset import *
 from .participant import *
 from .topic import *
+from .flexy_topic import *
 from .sub import *
 from .pub import *
 from .reader import *
+from .flexy_reader import *
 from .writer import *
-from .policy import *
+from .readcondition import *
+from .querycondition import *
+from .gaurdcondition import *
+from .flexy_writer import *

cdds/dds_binding.py

@@ -2,7 +2,6 @@
 import os
 from ctypes import *
 
-
 def get_lib_ext():
     system = platform.system()
     if system == 'Linux':
@@ -12,7 +11,30 @@ def get_lib_ext():
     else:
         return '.dll'
 
+
+# def get_user_lib_path():
+#     system = platform.system()
+#     if system == 'Linux':
+#         return '/usr/local/lib'
+#     elif system == 'Darwin':
+#         return '/usr/local/lib'
+#     elif system in ['windows', 'Windows', 'win32']:
+#         return os.environ['CDDS_HOME']
+#     else:
+#         return '/usr/local/lib'
+
 def get_user_lib_path():
+     system = platform.system()
+     if system == 'Linux':
+        return '/usr/local/lib'
+     elif system == 'Darwin':
+         return '/usr/local/lib'
+     elif system in ['windows', 'Windows', 'win32']:
+         return os.environ['CDDS_HOME']
+     else:
+        return '/usr/local/lib'
+
+def get_user_bit_lib_path():
     system = platform.system()
     if system == 'Linux':
         return '/usr/local/lib'
@@ -23,21 +45,35 @@ def get_user_lib_path():
     else:
         return '/usr/local/lib'
 
+# system = platform.system()
+# if system in ['windows', 'Windows', 'win32']:
+#     cham_lib = 'ddsc' + get_lib_ext()
+#     bit_lib = 'ddstubs' + get_lib_ext()
+#     cham_lib_path = get_user_bit_lib_path() + os.sep + cham_lib
+#     bit_lib_path = get_user_bit_lib_path() + os.sep + bit_lib
+# else:
+#     cham_lib = 'libddsbit' + get_lib_ext()
+#     bit_lib = 'libddstubs' + get_lib_ext()
+#     cham_lib_path = get_user_bit_lib_path() + os.sep + cham_lib
+#     bit_lib_path = get_user_bit_lib_path() + os.sep + bit_lib
+
 
 system = platform.system()
 if system in ['windows', 'Windows', 'win32']:
-    cham_lib = 'ddsc' + get_lib_ext()
-    bit_lib = 'ddstubs' + get_lib_ext()
-    cham_lib_path = get_user_lib_path() + os.sep + cham_lib
-    bit_lib_path = get_user_lib_path() + os.sep + bit_lib
+   cham_lib = 'ddsc' + get_lib_ext()
+   bit_lib = 'ddstubs' + get_lib_ext()
+   cham_lib_path = get_user_lib_path() + os.sep + cham_lib
+   bit_lib_path = get_user_bit_lib_path() + os.sep + bit_lib
 else:
     cham_lib = 'libddsc' + get_lib_ext()
     bit_lib = 'libddstubs' + get_lib_ext()
+    helloworld_lib = 'libddshelloworld' + get_lib_ext()
     cham_lib_path = get_user_lib_path() + os.sep + cham_lib
-    bit_lib_path = get_user_lib_path() + os.sep + bit_lib
+    bit_lib_path = get_user_bit_lib_path() + os.sep + bit_lib
+    helloworld_lib_path = get_user_bit_lib_path() + os.sep + helloworld_lib
 
 # Limits and Constants
-MAX_SAMPLES = 256
+MAX_SAMPLES = 100
 
 
 #
@@ -53,6 +89,7 @@ def get_user_lib_path():
 DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE = 32
 DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 64
 DDS_ANY_INSTANCE_STATE =  DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE | DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE
+DDS_ANY_INSTANCE_STATE = DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE | DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE
 
 DDS_ANY_STATE = DDS_ANY_SAMPLE_STATE | DDS_ANY_VIEW_STATE | DDS_ANY_INSTANCE_STATE
 
@@ -119,19 +156,28 @@ def get_user_lib_path():
 DDS_DESTINATIONORDER_BY_RECEPTION_TIMESTAMP = 0
 DDS_DESTINATIONORDER_BY_SOURCE_TIMESTAMP = 1
 
+LENGTH_UNLIMITED = -1
+
+
+def dds_infinity():
+    return 1e20
+
+
 def dds_secs(n):
-    return n*1000000000
+    return n * 1000000000
+
 
 def dds_millis(n):
-    return n*1000000
+    return n * 1000000
+
 
 def dds_micros(n):
-    return n*1000
+    return n * 1000
+
 
 def dds_nanos(n):
     return n
 
-
 #
 # DDS Sample Info
 #
@@ -171,7 +217,7 @@ def is_not_alive_instance(self):
 dds_entity_t = c_int32
 dds_time_t = c_int64
 dds_duration_t = c_int64
-dds_instance_handle_t = c_int64
+dds_instance_handle_t = c_uint64
 dds_domainid_t = c_uint32
 dds_sample_state_t = c_int
 dds_view_state_t = c_int
@@ -191,8 +237,6 @@ def is_not_alive_instance(self):
 SAMPLE_LOST_PROTO = CFUNCTYPE(None, c_void_p, c_void_p, c_void_p)
 
 
-
-
 # There are actually used to check the the listener are actually working...
 
 def trivial_on_requested_deadline_missed(r, s):
@@ -210,8 +254,6 @@ def trivial_on_sample_rejected(r, s):
     logger.debug('DefaultListener', '>> Sample Rejected')
 
 
-
-
 class DDSValue(Structure):
     _fields_ = [('value', c_char_p)]
 
@@ -233,6 +275,8 @@ class DDSSequence(Structure):
 #
 # Built-in key-value type
 #
+
+
 class DDSKeyBValue(Structure):
     _fields_ = [('key', c_char_p),
                 ('value', DDSSequence)]