working on it...
This commit is contained in:
parent
6e97787aa3
commit
03790de272
|
|
@ -143,7 +143,7 @@ main()
|
|||
perror("Failed to open file /tmp/slm.dot");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
api_skip_dot_slex(of, list, sprintf_slex_node);
|
||||
api_skip_dot_slex(of, list, 0, sprintf_slex_node);
|
||||
fclose(of);
|
||||
|
||||
api_skip_destroy_slex(list);
|
||||
|
|
|
|||
101
include/sl.h
101
include/sl.h
|
|
@ -277,8 +277,9 @@
|
|||
return NULL; \
|
||||
} \
|
||||
\
|
||||
/* -- skip_insert_ */ \
|
||||
int prefix##skip_insert_##decl(decl##_t *slist, decl##_node_t *n) \
|
||||
/* -- __skip_insert_ */ \
|
||||
static int __skip_insert_##decl(decl##_t *slist, decl##_node_t *n, \
|
||||
int flags) \
|
||||
{ \
|
||||
unsigned int i; \
|
||||
decl##_node_t *prev, *elm = slist->slh_head; \
|
||||
|
|
@ -305,10 +306,12 @@
|
|||
prev = elm; \
|
||||
elm = elm->field.sle_next[0]; \
|
||||
if (__skip_key_compare_##decl(slist, elm, n, slist->aux) == 0) { \
|
||||
if (flags == 0) { \
|
||||
/* Don't overwrite, to do that use _REPLACE not _INSERT */ \
|
||||
ARRAY_FREE(path); \
|
||||
return -1; \
|
||||
} \
|
||||
} \
|
||||
size_t level = __skip_toss_##decl(slist->max, slist->fanout); \
|
||||
ARRAY_SET_LENGTH(n->field.sle_next, level); \
|
||||
if (level > slist->level) { \
|
||||
|
|
@ -330,14 +333,17 @@
|
|||
return 0; \
|
||||
} \
|
||||
\
|
||||
/* -- skip_insert_dup_ TODO \
|
||||
/* -- skip_insert_ */ \
|
||||
int prefix##skip_insert_##decl(decl##_t *slist, decl##_node_t *n) \
|
||||
{ \
|
||||
return __skip_insert_##decl(slist, n, 0); \
|
||||
} \
|
||||
\
|
||||
/* -- skip_insert_dup_ */ \
|
||||
int prefix##skip_insert_dup_##decl(decl##_t *slist, decl##_node_t *n) \
|
||||
{ \
|
||||
((void)slist); \
|
||||
((void)n); \
|
||||
return 0; \
|
||||
return __skip_insert_##decl(slist, n, 1); \
|
||||
} \
|
||||
*/ \
|
||||
\
|
||||
/* -- skip_find_ \
|
||||
* Find a node that matches another node. This differs from the locate() \
|
||||
|
|
@ -477,7 +483,7 @@
|
|||
ARRAY_FREE(path); \
|
||||
free_node_blk; \
|
||||
/* Find all levels in the first element in the list that point \
|
||||
at the tail and shrink the level*/ \
|
||||
at the tail and shrink the level. */ \
|
||||
while (slist->level > 0 && \
|
||||
slist->slh_head->field.sle_next[slist->level] == slist->slh_tail) { \
|
||||
slist->level--; \
|
||||
|
|
@ -531,6 +537,31 @@
|
|||
return 0; \
|
||||
} \
|
||||
\
|
||||
/* -- skip_snapshot_ \
|
||||
* A snapshot is a read-only view of a Skiplist at a point in \
|
||||
* time. Once taken, a snapshot must be restored or disposed. \
|
||||
* Any number of snapshots can be created. \
|
||||
*/ \
|
||||
int prefix##skip_snapshot_##decl(decl##_t *slist) \
|
||||
{ \
|
||||
((void)slist); /* TODO */ \
|
||||
return 0; \
|
||||
} \
|
||||
\
|
||||
/* -- skip_restore_snapshot_ */ \
|
||||
int prefix##skip_restore_snapshot_##decl(decl##_t *slist) \
|
||||
{ \
|
||||
((void)slist); /* TODO */ \
|
||||
return 0; \
|
||||
} \
|
||||
\
|
||||
/* -- skip_dispose_snapshot_ */ \
|
||||
int prefix##skip_dispose_snapshot_##decl(decl##_t *slist) \
|
||||
{ \
|
||||
((void)slist); /* TODO */ \
|
||||
return 0; \
|
||||
} \
|
||||
\
|
||||
/* -- __skip_integrity_check_ */ \
|
||||
static int __skip_integrity_check_##decl(decl##_t *slist) \
|
||||
{ \
|
||||
|
|
@ -586,15 +617,15 @@
|
|||
decl##_node_t *node, size_t nsg, skip_sprintf_node_##decl##_t fn) \
|
||||
{ \
|
||||
char buf[2048]; \
|
||||
size_t level, height = ARRAY_LENGTH(node->field.sle_next); \
|
||||
size_t level, height = ARRAY_LENGTH(node->field.sle_next) - 1; \
|
||||
decl##_node_t *next; \
|
||||
\
|
||||
fprintf(os, "\"node%zu %p\"", nsg, (void *)node); \
|
||||
fprintf(os, " [label = \""); \
|
||||
level = height; \
|
||||
do { \
|
||||
fprintf(os, " { <w%zu> | <f%zu> %p }", level + 1, level + 1, \
|
||||
fprintf(os, " { <w%zu> | <f%zu> %p } |", level, level, \
|
||||
(void *)node->field.sle_next[level]); \
|
||||
if (level != 0) \
|
||||
fprintf(os, " | "); \
|
||||
} while (level--); \
|
||||
if (fn) { \
|
||||
fn(node, buf); \
|
||||
|
|
@ -609,17 +640,17 @@
|
|||
level = 0; \
|
||||
for (level = 0; level < height; level++) { \
|
||||
fprintf(os, "\"node%zu %p\"", nsg, (void *)node); \
|
||||
fprintf(os, ":f%zu -> ", level + 1); \
|
||||
fprintf(os, ":f%zu -> ", level); \
|
||||
fprintf(os, "\"node%zu %p\"", nsg, (void *)node->field.sle_next[level]); \
|
||||
fprintf(os, ":w%zu [];\n", level + 1); \
|
||||
fprintf(os, ":w%zu [];\n", level); \
|
||||
} \
|
||||
\
|
||||
if (node->field.sle_next[0] != SKIP_LAST(slist)) \
|
||||
__skip_dot_node_##decl(os, slist, node->field.sle_next[0], nsg, fn); \
|
||||
next = prefix##skip_next_node_##decl(slist, node); \
|
||||
if (next) \
|
||||
__skip_dot_node_##decl(os, slist, next, nsg, fn); \
|
||||
} \
|
||||
\
|
||||
/* -- __skip_dot_finish_ \
|
||||
* Finalise the DOT file of the internal representation. \
|
||||
* Finalize the DOT file of the internal representation. \
|
||||
*/ \
|
||||
static void __skip_dot_finish_##decl(FILE *os, size_t nsg) \
|
||||
{ \
|
||||
|
|
@ -645,7 +676,6 @@
|
|||
} \
|
||||
nsg = 0; \
|
||||
} \
|
||||
fprintf(os, "}\n"); \
|
||||
} \
|
||||
\
|
||||
/* -- skip_dot_start_ */ \
|
||||
|
|
@ -672,13 +702,13 @@
|
|||
if (SKIP_EMPTY(slist)) \
|
||||
fprintf(os, "Empty HeadNode"); \
|
||||
else { \
|
||||
level = ARRAY_LENGTH(head->field.sle_next); \
|
||||
while (level--) { \
|
||||
level = ARRAY_LENGTH(head->field.sle_next) - 1; \
|
||||
do { \
|
||||
decl##_node_t *node = head->field.sle_next[level]; \
|
||||
fprintf(os, "{ <f%zu> %p }", level + 1, (void *)node); \
|
||||
if (level + 1 != 0) \
|
||||
fprintf(os, "{ <f%zu> %p }", level, (void *)node); \
|
||||
if (level) \
|
||||
fprintf(os, " | "); \
|
||||
} \
|
||||
} while (level--); \
|
||||
} \
|
||||
fprintf(os, "\"\n"); \
|
||||
fprintf(os, "shape = \"record\"\n"); \
|
||||
|
|
@ -688,15 +718,15 @@
|
|||
decl##_node_t *node = slist->slh_head; \
|
||||
level = 0; \
|
||||
do { \
|
||||
fprintf(os, "\"HeadNode%zu\":f%zu -> ", nsg, level + 1); \
|
||||
fprintf(os, "\"HeadNode%zu\":f%zu -> ", nsg, level); \
|
||||
fprintf(os, "\"node%zu %p\"", nsg, (void *)node->field.sle_next[level]); \
|
||||
fprintf(os, ":w%zu [];\n", level + 1); \
|
||||
} while (level++ < slist->level); \
|
||||
fprintf(os, ":w%zu [];\n", level); \
|
||||
} while (++level < slist->level); \
|
||||
fprintf(os, "}\n\n"); \
|
||||
\
|
||||
/* Now all nodes via level 0, if non-empty */ \
|
||||
node = slist->slh_head; \
|
||||
if (ARRAY_LENGTH(node->field.sle_next)) \
|
||||
node = prefix##skip_head_##decl(slist); \
|
||||
if (node) \
|
||||
__skip_dot_node_##decl(os, slist, node->field.sle_next[0], nsg, fn); \
|
||||
fprintf(os, "\n"); \
|
||||
\
|
||||
|
|
@ -705,18 +735,18 @@
|
|||
fprintf(os, "\"node%zu 0x0\" [label = \"", nsg); \
|
||||
level = slist->level; \
|
||||
do { \
|
||||
fprintf(os, "<w%zu> NULL", level + 1); \
|
||||
if (level != 0) \
|
||||
fprintf(os, "<w%zu> NULL", level); \
|
||||
if (level) \
|
||||
fprintf(os, " | "); \
|
||||
} while (level-- > 0); \
|
||||
} while (--level); \
|
||||
fprintf(os, "\" shape = \"record\"];\n"); \
|
||||
} \
|
||||
\
|
||||
/* End: "subgraph cluster1 {" */ \
|
||||
/* End: "subgraph cluster0 {" */ \
|
||||
fprintf(os, "}\n\n"); \
|
||||
nsg += 1; \
|
||||
\
|
||||
return 0; \
|
||||
return nsg; \
|
||||
} \
|
||||
\
|
||||
/* -- skip_dot_ \
|
||||
|
|
@ -731,10 +761,9 @@
|
|||
* \
|
||||
* https://en.wikipedia.org/wiki/DOT_(graph_description_language) \
|
||||
*/ \
|
||||
int prefix##skip_dot_##decl(FILE *os, decl##_t *slist, \
|
||||
int prefix##skip_dot_##decl(FILE *os, decl##_t *slist, size_t nsg, \
|
||||
skip_sprintf_node_##decl##_t fn) \
|
||||
{ \
|
||||
size_t nsg = 0; \
|
||||
if (__skip_integrity_check_##decl(slist) != 0) { \
|
||||
perror("Skiplist failed integrity checks, impossible to diagram."); \
|
||||
return -1; \
|
||||
|
|
|
|||
Loading…
Reference in a new issue