summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged in dstaesse/ouroboros/be-fp (pull request #101)Sander Vrijders2016-05-203-11/+31
|\ | | | | | | lib: allow parallel connections
| * lib: allow parallel connectionsdimitri staessens2016-05-203-11/+31
|/ | | | | | dev.c: read now only reads an SDU if is is for the correct port_id shm_ap_rbuff: added a function peek() that returns the port_id of the tail.
* Merged in dstaesse/ouroboros/be-udp-flow-alloc-same-port (pull request #100)Sander Vrijders2016-05-206-258/+558
|\ | | | | | | ipcpd: Full flow allocation for the shim UDP
| * ipcpd: shim-udp: read fd on client sidedimitri staessens2016-05-201-0/+13
| | | | | | | | | | There could be a theoretical race condition that the server sends a message before the FD is set on the client side, which is resolved.
| * ipcpd: shim-ipcp: fixed race conditionsdimitri staessens2016-05-201-40/+57
| | | | | | | | | | | | | | | | | | | | | | There were two race conditions. The first was where client received the response message before the client UDP port was connected to the server UDP port and the first message of the client was sent to the LISTEN port instead of the server application port. This was solved by reordering the operations so the response is sent after the port is correctly connected. The second race condition is that the FD is not added to the set in time at the server side before the first SDU arrives. This was solved by adding a variable proteceted by a mutex.
| * ipcpd: shim-udp: removed debug codedimitri staessens2016-05-191-12/+0
| | | | | | | | | | some debug code for locking and a sleep check are removed from the shim-udp.
| * Implementation of a full flow allocator for the shim UDP.dimitri staessens2016-05-186-258/+540
|/ | | | | | | | | It uses UDP port 0x0D1F on all hosts to send and receive flow allocation messages. It supports communication between server and client AP over a single shim IPCP. Implementation of full flow deallocation is pending. Both the client and the server still have to call flow_dealloc();
* Merged in sandervrijders/ouroboros/be (pull request #99)dimitri staessens2016-05-171-2/+3
|\ | | | | | | lib: Add missing check upon garbage collection
| * Merge remote-tracking branch 'upstream/be' into beSander Vrijders2016-05-170-0/+0
| |\ | |/ |/|
* | Merged in sandervrijders/ouroboros/be (pull request #98)dimitri staessens2016-05-171-3/+4
|\ \ | | | | | | | | | lib: Fixed incorrect comparison
| | * lib: Add missing check upon garbage collectionSander Vrijders2016-05-171-2/+3
| |/ | | | | | | | | | | | | There was a check missing upon garbage collection. If the whole DU map has been used once, all DUs will have their garbage bit set to one. This meant that the garbage collector would keep moving the tail indefinitely.
| * lib: Fixed incorrect initializationSander Vrijders2016-05-171-3/+4
|/ | | | | When moving the tail pointer in the DU map, blocks was never reset to zero. This caused it to sometimes clean up too many DUs.
* Merged in dstaesse/ouroboros/be (pull request #97)Sander Vrijders2016-05-171-4/+2
|\ | | | | | | irmd: fixed bad locks
| * irmd: fixed bad locksdimitri staessens2016-05-171-4/+2
|/
* Merged in sandervrijders/ouroboros/be (pull request #96)dimitri staessens2016-05-165-25/+24
|\ | | | | | | lib: Add missing modulo calculation
| * lib: Add missing modulo calculationSander Vrijders2016-05-165-25/+24
|/ | | | | | Adds a missing modulo calculation that would result in index -1 being returned instead of zero when the ringbuffer skipped back to the beginning.
* Merged in dstaesse/ouroboros/be-dev-locks (pull request #95)Sander Vrijders2016-05-161-28/+33
|\ | | | | | | lib: dev: small locking improvements
| * lib: dev: small locking improvementsdimitri staessens2016-05-161-28/+33
| | | | | | | | | | | | This avoids holding the long locks during accept() and alloc_res() calls. Small reduction of time of other locks held. No changes in locking logic.
| * Merge branch 'be-udp-locks' into be-dev-locksdimitri staessens2016-05-152-96/+97
| |\
* | \ Merged in dstaesse/ouroboros/be-irmd-locks (pull request #94)Sander Vrijders2016-05-161-175/+223
|\ \ \ | | | | | | | | | | | | irmd: new locking implementation
| * | | irmd: fixed unlock after freedimitri staessens2016-05-161-2/+4
| | | | | | | | | | | | | | | | unlock is now called before the object is destroyed.
| * | | irmd: new locking implementationdimitri staessens2016-05-161-175/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This locking should be more consistent, It now has three locks, one guarding flows and port_id's, one guarding the registered apps and ipcps, and one guarding the overall state of the irmd. There are two additional mutexes guarding the condition variables.
* | | | Merged in dstaesse/ouroboros/be-udp-locks (pull request #92)Sander Vrijders2016-05-162-103/+94
|\ \ \ \ | | | | | | | | | | | | | | | ipcpd: shim-udp: Revised locking
| * | | | fixed two unlocks, removed the thread_lock.dimitri staessens2016-05-151-13/+3
| | |_|/ | |/| |
| * | | ipcpd: shim-udp: Revised lockingdimitri staessens2016-05-152-96/+97
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified locking to take only two locks: the first lock guards the state of the ipcp. This lock must be held for writing on bootstrap and closing, and held for reading during all other operations. The second lock guards operations on flows, and must be held for writing during allocation and deallocation, and held for reading when sending sdu's. After adding a fd to FD_SET, the shim will wait for 1 ms to ensure that the FD is added to the select call.
* | | Merged in dstaesse/ouroboros/be-dev-locks (pull request #93)Sander Vrijders2016-05-161-69/+65
|\ \ \ | |/ / |/| / | |/ lib: dev.c: Revised locking
| * lib: dev.c: Revised lockingdimitri staessens2016-05-151-69/+65
|/ | | | | fd and flows are now all protected by the flows_lock while the overall state of the AP is protected by the data_lock.
* Merged in dstaesse/ouroboros/release-fd (pull request #90)Sander Vrijders2016-05-151-7/+7
|\ | | | | | | lib: allow accepting any flows
| * lib: allow accepting any flowsdimitri staessens2016-05-151-7/+7
| | | | | | | | The application can call accept(fd, NULL, NULL);
* | Merged in dstaesse/ouroboros/release-fd (pull request #89)Sander Vrijders2016-05-153-2/+21
|\| | | | | | | lib: cleanup file descriptors for shared memory
| * lib: cleanup file descriptors for shared memorydimitri staessens2016-05-153-2/+21
|/ | | | | cleanup of file descriptors for the shared memory. also adds a missing NULL check and some invalidation in dev.c
* Merged in sandervrijders/ouroboros/be (pull request #88)dimitri staessens2016-05-151-2/+2
|\ | | | | | | ipcpd: Move lock in ipcp_udp_listener
| * ipcpd: Move lock in ipcp_udp_listenerSander Vrijders2016-05-151-2/+2
|/ | | | | This takes a lock before notifying the IRMd of a new flow request, to avoid race conditions when trying to retrieve the fd by port-id.
* Merged in dstaesse/ouroboros/be-udp (pull request #87)Sander Vrijders2016-05-151-10/+10
|\ | | | | | | ipcpd: shim-udp: added missing checks
| * ipcpd: shim-udp: added missing checksdimitri staessens2016-05-151-10/+10
|/
* Merged in dstaesse/ouroboros/udp-lockfix (pull request #86)Sander Vrijders2016-05-154-35/+42
|\ | | | | | | ipcpd: shim-udp: fixed locking.
| * lib: shm_ap_rbuff: simplified file offsetsdimitri staessens2016-05-151-13/+9
| | | | | | | | Used simpler pointer arithmetic to calculate the file offset pointers.
| * lib: irmd: fixed flow deallocationdimitri staessens2016-05-152-7/+12
| | | | | | | | | | Port_id's weren't correctly released. Also removes remaining debug logs from the library.
| * ipcpd: shim-udp: fixed locking.dimitri staessens2016-05-141-15/+21
|/ | | | | The fd_to_port_id function has no internal locking and must now be called under lock.
* Merged in sandervrijders/ouroboros/be (pull request #84)dimitri staessens2016-05-1420-135/+144
|\ | | | | | | lib, ipcpd, irmd: Add QoS cube definition
| * lib: Fix header inclusionSander Vrijders2016-05-146-26/+28
| | | | | | | | | | | | This fixes wrong header inclusion that would make programs which are not developed within ouroboros fail upon compilation, since they would not find certain headers on their system.
| * Merge remote-tracking branch 'upstream/be' into beSander Vrijders2016-05-143-0/+169
| |\
| * | lib, ipcpd, irmd: Add QoS cube definitionSander Vrijders2016-05-1416-109/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the QoS cube definition, which is an enum to select which QoS is needed in the IPCP. An application has to use the qos_spec in qos.h to define what it needs. The IRMd will map this unto a qos cube definition. Some headers are now also no longer installed on the system, since they are only to be used within the irmd and ipcps.
* | | Merged in dstaesse/ouroboros/dev-initialise (pull request #85)Sander Vrijders2016-05-142-37/+179
|\ \ \ | | | | | | | | | | | | lib: dev.c: added locking
| * | | lib: dev.c: added lockingdimitri staessens2016-05-142-37/+179
| | |/ | |/| | | | | | | | | | Locking is required for multi-threaded applications. Flows are locked separately. Read/Write locks are used for concurrent reads.
* | | Merged in dstaesse/ouroboros/be-udp (pull request #82)Sander Vrijders2016-05-143-109/+387
|\ \ \ | |/ / |/| | | | | Be udp
| * | ipcpd: shim-udp: log error when failed sending SDUdimitri staessens2016-05-141-1/+2
| | |
| * | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-udpdimitri staessens2016-05-140-0/+0
| |\ \ | |/ / |/| |
* | | Merged in dstaesse/ouroboros/be-rw_lock (pull request #80)dimitri staessens2016-05-144-0/+170
|\ \ \ | |_|/ |/| | | | | lib: implementation of read/write locks
| * | Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be-rw_lockdimitri staessens2016-05-141-5/+4
| |\ \ | |/ / |/| |