hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-MAX-2

Browse Source
This commit is contained in:
MassimilianoPinto
2014-03-03 17:43:52 +01:00
parent c6cfc99ee3 dfb965e094
commit 6322586832
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/core/dcb.c
View File

@ -109,6 +109,7 @@ DCB *rval;
#endif #endif
rval->dcb_role = role; rval->dcb_role = role;
#if 1 #if 1
//let's call simple_mutex_done in dcb_final_free
simple_mutex_init(&rval->dcb_write_lock, "DCB write mutex"); simple_mutex_init(&rval->dcb_write_lock, "DCB write mutex");
simple_mutex_init(&rval->dcb_read_lock, "DCB read mutex"); simple_mutex_init(&rval->dcb_read_lock, "DCB read mutex");
rval->dcb_write_active = false; rval->dcb_write_active = false;
@ -302,6 +303,12 @@ dcb_final_free(DCB *dcb)
if (dcb->remote) if (dcb->remote)
free(dcb->remote); free(dcb->remote);
bitmask_free(&dcb->memdata.bitmask); bitmask_free(&dcb->memdata.bitmask);
#if 1
simple_mutex_done(&dcb->dcb_read_lock);
simple_mutex_done(&dcb->dcb_write_lock);
#endif
free(dcb); free(dcb);
} }