bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the mirror commit state mbox to struct control

Browse Source 
The mirror_super signals the commit state to the control thread via an
mbox, and this mbox is moved to control.  It was owned by mirror_super,
but the problem with that is that mirror_super can free the mbox before
the control client has been scheduled to receive the message.  If it's
owned by the control object, that can't happen.
This commit is contained in:
Alex Young
2012-07-15 21:57:36 +01:00
parent b20fbc6a66
commit 10625e402b
6 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mirror.c
View File

@@ -481,7 +481,8 @@ struct mirror_super * mirror_super_create(
union mysockaddr * connect_to,
union mysockaddr * connect_from,
int max_Bps,
int action_at_finish)
int action_at_finish,
struct mbox * state_mbox)
{
struct mirror_super * super = xmalloc( sizeof( struct mirror_super) );
super->mirror = mirror_create(
@@ -491,12 +492,12 @@ struct mirror_super * mirror_super_create(
max_Bps,
action_at_finish,
mbox_create() ) ;
super->state_mbox = mbox_create();
super->state_mbox = state_mbox;
return super;
}
/* Post the current state of the mirror into super->state_mbox */
/* Post the current state of the mirror into super->state_mbox.*/
void mirror_super_signal_committed(
struct mirror_super * super ,
enum mirror_state commit_state )
@@ -514,7 +515,6 @@ void mirror_super_destroy( struct mirror_super * super )
{
NULLCHECK( super );
mbox_destroy( super->state_mbox );
mbox_destroy( super->mirror->commit_signal );
mirror_destroy( super->mirror );
free( super );
@@ -612,25 +612,3 @@ void * mirror_super_runner( void * serve_uncast )
}
#define write_socket(msg) write(client_fd, (msg "\n"), strlen((msg))+1)
/* Call this in the thread where you want to receive the mirror state */
enum mirror_state mirror_super_wait( struct mirror_super * super )
{
NULLCHECK( super );
NULLCHECK( super->state_mbox );
struct mbox * mbox = super->state_mbox;
enum mirror_state mirror_state;
enum mirror_state * contents;
contents = (enum mirror_state*)mbox_receive( mbox );
NULLCHECK( contents );
mirror_state = *contents;
free(contents);
return mirror_state;
}