pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sorted_queue_pop_all rename to sorted_queue_pop_to_chain

fstore_storage_engine
YuQing 2023-05-05 08:09:08 +08:00
parent 428d13a07b
commit a19119f962
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sorted_queue.c
View File

@ -111,8 +111,9 @@ void *sorted_queue_pop_ex(struct sorted_queue *sq,
return data; return data;
} }
void sorted_queue_pop_all_ex(struct sorted_queue *sq, void *less_equal, void sorted_queue_pop_to_chain_ex(struct sorted_queue *sq,
struct fc_list_head *head, const bool blocked) void *less_equal, struct fc_list_head *head,
const bool blocked)
{ {
struct fc_list_head *current; struct fc_list_head *current;

13
src/sorted_queue.h
View File

@ -87,14 +87,15 @@ void *sorted_queue_pop_ex(struct sorted_queue *sq,
#define sorted_queue_try_pop(sq, less_equal) \ #define sorted_queue_try_pop(sq, less_equal) \
sorted_queue_pop_ex(sq, less_equal, false) sorted_queue_pop_ex(sq, less_equal, false)
void sorted_queue_pop_all_ex(struct sorted_queue *sq, void *less_equal, void sorted_queue_pop_to_chain_ex(struct sorted_queue *sq,
struct fc_list_head *head, const bool blocked); void *less_equal, struct fc_list_head *head,
const bool blocked);
#define sorted_queue_pop_all(sq, less_equal, head) \ #define sorted_queue_pop_to_chain(sq, less_equal, head) \
sorted_queue_pop_all_ex(sq, less_equal, head, true) sorted_queue_pop_to_chain_ex(sq, less_equal, head, true)
#define sorted_queue_try_pop_all(sq, less_equal, head) \ #define sorted_queue_try_pop_to_chain(sq, less_equal, head) \
sorted_queue_pop_all_ex(sq, less_equal, head, false) sorted_queue_pop_to_chain_ex(sq, less_equal, head, false)
static inline bool sorted_queue_empty(struct sorted_queue *sq) static inline bool sorted_queue_empty(struct sorted_queue *sq)
{ {

10
src/tests/test_sorted_queue.c
View File

@ -77,7 +77,7 @@ static void test1()
} }
less_equal.n = COUNT; less_equal.n = COUNT;
sorted_queue_try_pop_all(&sq, &less_equal, &head); sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
assert(sorted_queue_empty(&sq)); assert(sorted_queue_empty(&sq));
i = 0; i = 0;
@ -90,7 +90,7 @@ static void test1()
} }
assert(i == COUNT); assert(i == COUNT);
sorted_queue_try_pop_all(&sq, &less_equal, &head); sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
assert(fc_list_empty(&head)); assert(fc_list_empty(&head));
} }
@ -109,11 +109,11 @@ static void test2()
} }
less_equal.n = 0; less_equal.n = 0;
sorted_queue_try_pop_all(&sq, &less_equal, &head); sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
assert(fc_list_empty(&head)); assert(fc_list_empty(&head));
less_equal.n = COUNT; less_equal.n = COUNT;
sorted_queue_try_pop_all(&sq, &less_equal, &head); sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
assert(!sorted_queue_empty(&sq)); assert(!sorted_queue_empty(&sq));
i = 0; i = 0;
@ -126,7 +126,7 @@ static void test2()
} }
less_equal.n = 2 * COUNT + 1; less_equal.n = 2 * COUNT + 1;
sorted_queue_try_pop_all(&sq, &less_equal, &head); sorted_queue_try_pop_to_chain(&sq, &less_equal, &head);
assert(sorted_queue_empty(&sq)); assert(sorted_queue_empty(&sq));
fc_list_for_each_entry (number, &head, dlink) { fc_list_for_each_entry (number, &head, dlink) {
n = i++ * MULTIPLE + 1; n = i++ * MULTIPLE + 1;