summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* irmd: use the shm_du_map as a uniqueness checkdimitri staessens2016-05-221-2/+7
| | | | | This makes sure only one shm_du_map is running in the system. Starting a second irmd would invalidate the shared memory map.
* Merged in sandervrijders/ouroboros/be (pull request #108)dimitri staessens2016-05-221-1/+1
|\ | | | | | | irmd: Change read lock to write lock
| * irmd: Change read lock to write lockSander Vrijders2016-05-221-1/+1
| | | | | | | | | | A read lock was taken instead of a write lock, which resulted in double frees.
* | Merged in dstaesse/ouroboros/be-udp-fix (pull request #106)Sander Vrijders2016-05-221-0/+3
|\ \ | |/ |/| | | ipcpd: shim-udp: fixed missing NULL check
| * ipcpd: shim-udp: fixed missing NULL checkdimitri staessens2016-05-221-0/+3
|/ | | | Conf was not checked on bootstrap.
* Merged in dstaesse/ouroboros/be-dealloc-full (pull request #105)Sander Vrijders2016-05-224-37/+47
|\ | | | | | | lib, ipcpd, irmd: fixes deallocation and fast path
| * lib, ipcpd, irmd: fixes deallocation and fast pathdimitri staessens2016-05-224-37/+47
|/ | | | | | The fast path has been rewritten to have certainty to read the correct flow. Deallocation will not release port_id's or fd's until they are explicitly released locally.
* Merged in sandervrijders/ouroboros/be (pull request #104)Sander Vrijders2016-05-221-2/+0
|\ | | | | | | ipcpd: Remove install command from build
| * ipcpd: Remove install command from buildSander Vrijders2016-05-221-2/+0
|/ | | | | This removes an install command from the build, since the protobuf header file was being installed in the source directory.
* Merged in dstaesse/ouroboros/be-dealloc (pull request #103)Sander Vrijders2016-05-225-63/+189
|\ | | | | | | lib, irmd, ipcpd: Flow deallocation over shim UDP
| * lib: removed fd cleaning functiondimitri staessens2016-05-222-30/+14
| |
| * ipcpd: homogenous debug messages for deallocationdimitri staessens2016-05-211-8/+1
| |
| * lib, irmd, ipcpd: Flow deallocation over shim UDPdimitri staessens2016-05-215-61/+210
|/ | | | | | The shim UDP now supports deallocating a flow end-to-end. Contains some stability fixes for flow allocation and some missing close() calls in lib/sockets.
* Merged in dstaesse/ouroboros/be-fix-segfaults (pull request #102)Sander Vrijders2016-05-202-4/+2
|\ | | | | | | fixes segfaults in dev.c and in shim-udp
| * lib, ipcpd: fixes segfaults in dev.c and shim-udpdimitri staessens2016-05-202-4/+2
|/
* 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
|/