quinn-os/my-basic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*refactored list sort.

Browse Source
This commit is contained in:
paladin-t 2016-02-02 10:24:48 +08:00
parent c4b4a0d53f
commit afbb9baf8a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/my_basic.c
View File

@ -1007,7 +1007,7 @@ static _ls_node_t* _ls_insert_at(_ls_node_t* list, int index, void* data);
static unsigned int _ls_remove(_ls_node_t* list, _ls_node_t* node, _ls_operation op); static unsigned int _ls_remove(_ls_node_t* list, _ls_node_t* node, _ls_operation op);
static unsigned int _ls_try_remove(_ls_node_t* list, void* info, _ls_compare cmp, _ls_operation op); static unsigned int _ls_try_remove(_ls_node_t* list, void* info, _ls_compare cmp, _ls_operation op);
static unsigned int _ls_foreach(_ls_node_t* list, _ls_operation op); static unsigned int _ls_foreach(_ls_node_t* list, _ls_operation op);
static void _ls_sort(_ls_node_t* list, _ls_compare cmp); static _ls_node_t* _ls_sort(_ls_node_t** list, _ls_compare cmp);
static int _ls_count(_ls_node_t* list); static int _ls_count(_ls_node_t* list);
static bool_t _ls_empty(_ls_node_t* list); static bool_t _ls_empty(_ls_node_t* list);
static void _ls_clear(_ls_node_t* list); static void _ls_clear(_ls_node_t* list);
@ -2151,22 +2151,26 @@ unsigned int _ls_foreach(_ls_node_t* list, _ls_operation op) {
return idx; return idx;
} }
void _ls_sort(_ls_node_t* list, _ls_compare cmp) { _ls_node_t* _ls_sort(_ls_node_t** list, _ls_compare cmp) {
_ls_node_t* ptr = 0; _ls_node_t* ptr = 0;
_ls_node_t* lst = 0;
void* tmp = 0; void* tmp = 0;
mb_assert(list && cmp); mb_assert(list && cmp);
list = list->next; lst = *list;
for( ; list; list = list->next) { lst = lst->next;
for(ptr = list; ptr; ptr = ptr->next) { for( ; lst; lst = lst->next) {
if(cmp(list->data, ptr->data) > 0) { for(ptr = lst; ptr; ptr = ptr->next) {
if(cmp(lst->data, ptr->data) > 0) {
tmp = ptr->data; tmp = ptr->data;
ptr->data = list->data; ptr->data = lst->data;
list->data = tmp; lst->data = tmp;
} }
} }
} }
return *list;
} }
int _ls_count(_ls_node_t* list) { int _ls_count(_ls_node_t* list) {
@ -6233,7 +6237,7 @@ void _sort_list(_list_t* coll) {
/* Sort a list */ /* Sort a list */
mb_assert(coll); mb_assert(coll);
_ls_sort(coll->list, (_ls_compare)_ht_cmp_object); _ls_sort(&coll->list, (_ls_compare)_ht_cmp_object);
_write_on_ref_object(&coll->lock, &coll->ref, coll); _write_on_ref_object(&coll->lock, &coll->ref, coll);
_invalidate_list_cache(coll); _invalidate_list_cache(coll);