Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

files: Implement {set,clear,wait}_fds_event()

Browse source 
The idea is symilar to kernel's wake_up() and wait_event().
One task needs some event. It checks the event has not
happened yet (fle hasn't received, unix peer hasn't bound, etc)
and calls get_fds_event(). Other task makes the event
(sends a fle, binds the peer to a name, etc) and calls set_fds_event().

So, while there is no an event, the first task is sleeping,
and the second wakes it up later:

Task A:      clear_fds_event();
             if (!socket_bound)
                     wait_fds_event(); /* sleep */

Task B:      bind_socket();
             set_fds_event();         /* wake up */

For the details of using see next patches.

v5: Use bit operations.
    Split clear_fds_event from wait function.

v2: Do not wait for foreign transport sock is ready,
as it's guarantied by we create it before CR_STATE_FORKING.

travis-ci: success for Rework file opening scheme to make it asynchronous (rev5)
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2016-12-26 17:27:08 +03:00 • committed by Pavel Emelyanov
parent 919df37c25
commit 735461e1bf
3 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

29
criu/files.c
View file

@ -149,6 +149,35 @@ out:
return fd;
}
int set_fds_event(pid_t virt)
{
struct pstree_item *item;
int old;
item = pstree_item_by_virt(virt);
BUG_ON(!item);
old = test_and_set_bit(FDS_EVENT_BIT, (unsigned long *)&item->task_st);
if (!(old & FDS_EVENT))
futex_wake(&item->task_st);
return 0;
}
void clear_fds_event(void)
{
futex_t *f = &current->task_st;
clear_bit(FDS_EVENT_BIT, (unsigned long *)&f->raw.counter);
}
void wait_fds_event(void)
{
futex_t *f = &current->task_st;
futex_wait_if_cond(f, FDS_EVENT, &);
clear_fds_event();
}
/*
* A file may be shared between several file descriptors. E.g
* when doing a fork() every fd of a forker and respective fds

2
criu/include/files.h
View file

@ -193,5 +193,7 @@ int dup_fle(struct pstree_item *task, struct fdinfo_list_entry *ple,
int fd, unsigned flags);
extern int open_transport_socket(void);
extern int set_fds_event(pid_t virt);
extern void wait_fds_event(void);
#endif /* __CR_FILES_H__ */

6
include/common/lock.h
View file

@ -79,6 +79,12 @@ static inline void futex_set_and_wake(futex_t *f, uint32_t v)
LOCK_BUG_ON(sys_futex((uint32_t *)&f->raw.counter, FUTEX_WAKE, INT_MAX, NULL, NULL, 0) < 0);
}
/* Wake up all futex @f waiters */
static inline void futex_wake(futex_t *f)
{
LOCK_BUG_ON(sys_futex((uint32_t *)&f->raw.counter, FUTEX_WAKE, INT_MAX, NULL, NULL, 0) < 0);
}
/* Mark futex @f as wait abort needed and wake up all waiters */
static inline void futex_abort_and_wake(futex_t *f)
{