Commit 8bc97c6d authored by Andreas Schmidt's avatar Andreas Schmidt

Update to xlap being optional. Remove xlap from Python bindings.

parent 770f62df
Pipeline #994 failed with stages
in 59 seconds
......@@ -121,17 +121,6 @@ cdef extern from "proto/socket.h":
bint PrrtSocket_set_sock_opt(PrrtSocket *sock_ptr, const_char *name, const uint32_t value)
uint32_t PrrtSocket_get_sock_opt(PrrtSocket *sock_ptr, const_char *name)
cdef extern from "xlap/xlap.h":
ctypedef struct XlapTimestampTable:
pass
cdef enum XlapTimestampPacketKind:
ts_data_packet = 0,
ts_any_packet = 0,
ts_redundancy_packet = 1
void XlapTimestampTableInstall(PrrtSocket* sck, XlapTimestampPacketKind kind, XlapTimestampTable* tstp);
cdef extern from "util/bptree.h":
ctypedef struct BPTreeNode:
pass
......
......@@ -6,9 +6,6 @@ cimport cprrt
cdef extern from "proto/applicationConstraints.c":
pass
cdef extern from "xlap/xlap.c":
pass
cdef extern from "proto/stores/dataPacketStore.c":
pass
......@@ -69,19 +66,11 @@ cdef extern from "util/list.c":
cdef class PrrtSocket:
cdef cprrt.PrrtSocket* _c_socket
cdef bint isSender
cdef cprrt.XlapTimestampTable* tstable_data
cdef cprrt.XlapTimestampTable* tstable_redundancy
def __cinit__(self, port, isSender):
self._c_socket = cprrt.PrrtSocket_create(isSender)
cprrt.PrrtSocket_bind(self._c_socket, "0.0.0.0", port)
self.tstable_data = <cprrt.XlapTimestampTable*> malloc(sizeof(cprrt.XlapTimestampTable))
self.tstable_redundancy = <cprrt.XlapTimestampTable*> malloc(sizeof(cprrt.XlapTimestampTable))
cprrt.XlapTimestampTableInstall(self._c_socket, cprrt.ts_data_packet, self.tstable_data)
cprrt.XlapTimestampTableInstall(self._c_socket, cprrt.ts_redundancy_packet, self.tstable_redundancy)
self.isSender = isSender
property target_delay:
......@@ -113,5 +102,3 @@ cdef class PrrtSocket:
def __dealloc__(self):
if self._c_socket != NULL:
cprrt.PrrtSocket_close(self._c_socket)
free(self.tstable_data)
free(self.tstable_redundancy)
Subproject commit 53cce0dd62db218131b3d8fd3e81a5855b2d9be4
Subproject commit a742d3a9ca9c6aa912afc2935f48a77658b6925d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment