X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fstatic%2Fwfstack.h;h=e96c8876a2b916dcd5bde1e1ba2ad3f8b5ff4ec8;hp=261ff2c2a46ab278ee8f1324db1e406e02b4a1ca;hb=200d100e05ed8e10c47f971939042f2406df92ef;hpb=711ff0f91fa2270148ec6b36dadad7fb135ee70b diff --git a/urcu/static/wfstack.h b/urcu/static/wfstack.h index 261ff2c..e96c887 100644 --- a/urcu/static/wfstack.h +++ b/urcu/static/wfstack.h @@ -77,7 +77,8 @@ void _cds_wfs_node_init(struct cds_wfs_node *node) } /* - * __cds_wfs_init: initialize wait-free stack. + * __cds_wfs_init: initialize wait-free stack. Don't pair with + * any destroy function. */ static inline void ___cds_wfs_init(struct __cds_wfs_stack *s) { @@ -85,7 +86,8 @@ static inline void ___cds_wfs_init(struct __cds_wfs_stack *s) } /* - * cds_wfs_init: initialize wait-free stack. + * cds_wfs_init: initialize wait-free stack. Pair with + * cds_wfs_destroy(). */ static inline void _cds_wfs_init(struct cds_wfs_stack *s) @@ -97,6 +99,17 @@ void _cds_wfs_init(struct cds_wfs_stack *s) assert(!ret); } +/* + * cds_wfs_destroy: destroy wait-free stack. Pair with + * cds_wfs_init(). + */ +static inline +void _cds_wfs_destroy(struct cds_wfs_stack *s) +{ + int ret = pthread_mutex_destroy(&s->lock); + assert(!ret); +} + static inline bool ___cds_wfs_end(void *node) { return node == CDS_WFS_END; @@ -160,7 +173,7 @@ ___cds_wfs_node_sync_next(struct cds_wfs_node *node, int blocking) if (!blocking) return CDS_WFS_WOULDBLOCK; if (++attempt >= CDS_WFS_ADAPT_ATTEMPTS) { - poll(NULL, 0, CDS_WFS_WAIT); /* Wait for 10ms */ + (void) poll(NULL, 0, CDS_WFS_WAIT); /* Wait for 10ms */ attempt = 0; } else { caa_cpu_relax();