Commit e6ac373d398d65eb16a8e847067fd3deedea4f70
2023-03-27T08:36:03
wip facts_lock
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463
diff --git a/libc3/env.c b/libc3/env.c
index 83d761d..53b8cf9 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -532,7 +532,7 @@ s_module * env_module_load (s_env *env, s_module *module,
return module;
}
-bool env_operator_is_right_associative (const s_env *env, const s_ident *op)
+bool env_operator_is_right_associative (s_env *env, const s_ident *op)
{
s_facts_with_cursor cursor;
s8 r;
@@ -555,7 +555,7 @@ bool env_operator_is_right_associative (const s_env *env, const s_ident *op)
return r;
}
-s8 env_operator_precedence (const s_env *env, const s_ident *op)
+s8 env_operator_precedence (s_env *env, const s_ident *op)
{
s_facts_with_cursor cursor;
s_tag tag_ident;
diff --git a/libc3/env.h b/libc3/env.h
index 883e9be..0e438ba 100644
--- a/libc3/env.h
+++ b/libc3/env.h
@@ -44,9 +44,9 @@ bool env_eval_progn (s_env *env, const s_list *program,
bool env_eval_tag (s_env *env, const s_tag *tag, s_tag *dest);
s_module * env_module_load (s_env *env, s_module *module,
const s_sym *name, s_facts *facts);
-bool env_operator_is_right_associative (const s_env *env,
+bool env_operator_is_right_associative (s_env *env,
const s_ident *op);
-s8 env_operator_precedence (const s_env *env,
+s8 env_operator_precedence (s_env *env,
const s_ident *op);
/* control structures */
diff --git a/libc3/facts_cursor.c b/libc3/facts_cursor.c
index e438a64..14d5b52 100644
--- a/libc3/facts_cursor.c
+++ b/libc3/facts_cursor.c
@@ -13,12 +13,20 @@
#include <assert.h>
#include <err.h>
#include <stdlib.h>
+#include "facts.h"
#include "facts_cursor.h"
#include "skiplist__fact.h"
#include "skiplist_node__fact.h"
#include "tag.h"
-s_facts_cursor * facts_cursor_init (s_facts_cursor *cursor,
+void facts_cursor_clean (s_facts_cursor *cursor)
+{
+ assert(cursor);
+ facts_cursor_lock_clean(cursor);
+}
+
+s_facts_cursor * facts_cursor_init (s_facts *facts,
+ s_facts_cursor *cursor,
s_skiplist__fact *index,
s_fact *start,
s_fact *end)
@@ -48,12 +56,48 @@ s_facts_cursor * facts_cursor_init (s_facts_cursor *cursor,
cursor->var_subject = NULL;
cursor->var_predicate = NULL;
cursor->var_object = NULL;
+ cursor->facts = facts;
+ facts_cursor_lock_init(cursor);
+ return cursor;
+}
+
+s_facts_cursor * facts_cursor_lock (s_facts_cursor *cursor)
+{
+ assert(cursor);
+ if (pthread_mutex_lock(&cursor->mutex))
+ errx(1, "facts_cursor_lock: pthread_mutex_lock");
+ return cursor;
+}
+
+s_facts_cursor * facts_cursor_lock_clean (s_facts_cursor *cursor)
+{
+ assert(cursor);
+ if (pthread_mutex_destroy(&cursor->mutex))
+ errx(1, "facts_cursor_lock_clean: pthread_mutex_destroy");
+ return cursor;
+}
+
+s_facts_cursor * facts_cursor_lock_init (s_facts_cursor *cursor)
+{
+ assert(cursor);
+ if (pthread_mutex_init(&cursor->mutex, NULL))
+ errx(1, "facts_cursor_lock_init: pthread_mutex_init");
+ return cursor;
+}
+
+s_facts_cursor * facts_cursor_lock_unlock (s_facts_cursor *cursor)
+{
+ assert(cursor);
+ if (pthread_mutex_unlock(&cursor->mutex))
+ errx(1, "facts_cursor_lock_unlock: pthread_mutex_unlock");
return cursor;
}
s_fact * facts_cursor_next (s_facts_cursor *cursor)
{
assert(cursor);
+ facts_lock_r(cursor->facts);
+ facts_cursor_lock(cursor);
if (cursor->node) {
cursor->node = SKIPLIST_NODE_NEXT__fact(cursor->node, 0);
if (cursor->node &&
@@ -68,6 +112,8 @@ s_fact * facts_cursor_next (s_facts_cursor *cursor)
*cursor->var_predicate = *fact->predicate;
if (cursor->var_object)
*cursor->var_object = *fact->object;
+ facts_cursor_lock_unlock(cursor);
+ facts_lock_unlock_r(cursor->facts);
return fact;
}
if (cursor->var_subject)
@@ -76,5 +122,7 @@ s_fact * facts_cursor_next (s_facts_cursor *cursor)
tag_init_var(cursor->var_predicate);
if (cursor->var_object)
tag_init_var(cursor->var_object);
+ facts_cursor_lock_unlock(cursor);
+ facts_lock_unlock_r(cursor->facts);
return NULL;
}
diff --git a/libc3/facts_cursor.h b/libc3/facts_cursor.h
index f08ba0f..91ae855 100644
--- a/libc3/facts_cursor.h
+++ b/libc3/facts_cursor.h
@@ -16,12 +16,18 @@
#include "types.h"
/* Stack allocation compatible functions */
-s_facts_cursor * facts_cursor_init (s_facts_cursor *cursor,
+void facts_cursor_clean (s_facts_cursor *cursor);
+s_facts_cursor * facts_cursor_init (s_facts *facts,
+ s_facts_cursor *cursor,
s_skiplist__fact *tree,
s_fact *start,
s_fact *end);
/* Modifiers */
-s_fact * facts_cursor_next (s_facts_cursor *cursor);
+s_facts_cursor * facts_cursor_lock (s_facts_cursor *cursor);
+s_facts_cursor * facts_cursor_lock_clean (s_facts_cursor *cursor);
+s_facts_cursor * facts_cursor_lock_init (s_facts_cursor *cursor);
+s_facts_cursor * facts_cursor_lock_unlock (s_facts_cursor *cursor);
+s_fact * facts_cursor_next (s_facts_cursor *cursor);
#endif /* FACTS_H */
diff --git a/libc3/facts_with.c b/libc3/facts_with.c
index ca3704b..8096719 100644
--- a/libc3/facts_with.c
+++ b/libc3/facts_with.c
@@ -17,7 +17,7 @@
#include "facts_with.h"
#include "tag.h"
-s_facts_with_cursor * facts_with (const s_facts *facts,
+s_facts_with_cursor * facts_with (s_facts *facts,
s_facts_with_cursor *cursor,
p_facts_spec spec)
{
@@ -42,7 +42,7 @@ s_facts_with_cursor * facts_with (const s_facts *facts,
return cursor;
}
-s_facts_cursor * facts_with_0 (const s_facts *facts,
+s_facts_cursor * facts_with_0 (s_facts *facts,
s_facts_cursor *cursor,
s_tag *var_subject,
s_tag *var_predicate,
@@ -50,14 +50,14 @@ s_facts_cursor * facts_with_0 (const s_facts *facts,
{
assert(facts);
assert(cursor);
- facts_cursor_init(cursor, facts->index_spo, NULL, NULL);
+ facts_cursor_init(facts, cursor, facts->index_spo, NULL, NULL);
cursor->var_subject = var_subject;
cursor->var_predicate = var_predicate;
cursor->var_object = var_object;
return cursor;
}
-s_facts_cursor * facts_with_1_2 (const s_facts *facts,
+s_facts_cursor * facts_with_1_2 (s_facts *facts,
s_facts_cursor *cursor,
const s_tag *subject,
const s_tag *predicate,
@@ -87,14 +87,14 @@ s_facts_cursor * facts_with_1_2 (const s_facts *facts,
tree = facts->index_pos;
else
tree = facts->index_osp;
- facts_cursor_init(cursor, tree, &start, &end);
+ facts_cursor_init(facts, cursor, tree, &start, &end);
cursor->var_subject = var_subject;
cursor->var_predicate = var_predicate;
cursor->var_object = var_object;
return cursor;
}
-s_facts_cursor * facts_with_3 (const s_facts *facts,
+s_facts_cursor * facts_with_3 (s_facts *facts,
s_facts_cursor *cursor,
const s_tag *subject,
const s_tag *predicate,
@@ -109,10 +109,10 @@ s_facts_cursor * facts_with_3 (const s_facts *facts,
fact.subject = subject;
fact.predicate = predicate;
fact.object = object;
- return facts_cursor_init(cursor, facts->index_spo, &fact, &fact);
+ return facts_cursor_init(facts, cursor, facts->index_spo, &fact, &fact);
}
-s_facts_cursor * facts_with_tags (const s_facts *facts,
+s_facts_cursor * facts_with_tags (s_facts *facts,
s_facts_cursor *cursor,
s_tag *subject,
s_tag *predicate,
diff --git a/libc3/facts_with.h b/libc3/facts_with.h
index e9bac77..f684827 100644
--- a/libc3/facts_with.h
+++ b/libc3/facts_with.h
@@ -15,17 +15,17 @@
#include "types.h"
-s_facts_with_cursor * facts_with (const s_facts *facts,
+s_facts_with_cursor * facts_with (s_facts *facts,
s_facts_with_cursor *cursor,
p_facts_spec spec);
-s_facts_cursor * facts_with_0 (const s_facts *facts,
+s_facts_cursor * facts_with_0 (s_facts *facts,
s_facts_cursor *cursor,
s_tag *var_subject,
s_tag *var_predicate,
s_tag *var_object);
-s_facts_cursor * facts_with_1_2 (const s_facts *facts,
+s_facts_cursor * facts_with_1_2 (s_facts *facts,
s_facts_cursor *cursor,
const s_tag *subject,
const s_tag *predicate,
@@ -34,13 +34,13 @@ s_facts_cursor * facts_with_1_2 (const s_facts *facts,
s_tag *var_predicate,
s_tag *var_object);
-s_facts_cursor * facts_with_3 (const s_facts *facts,
+s_facts_cursor * facts_with_3 (s_facts *facts,
s_facts_cursor *cursor,
const s_tag *subject,
const s_tag *predicate,
const s_tag *object);
-s_facts_cursor * facts_with_tags (const s_facts *facts,
+s_facts_cursor * facts_with_tags (s_facts *facts,
s_facts_cursor *cursor,
s_tag *subject,
s_tag *predicate,
diff --git a/libc3/facts_with_cursor.c b/libc3/facts_with_cursor.c
index 3220d9b..11e073a 100644
--- a/libc3/facts_with_cursor.c
+++ b/libc3/facts_with_cursor.c
@@ -25,7 +25,10 @@ void facts_with_cursor_clean (s_facts_with_cursor *cursor)
uw i = 0;
assert(cursor);
while (i < cursor->facts_count) {
- free(cursor->levels[i].spec);
+ if (cursor->levels[i].spec) {
+ free(cursor->levels[i].spec);
+ facts_cursor_clean(&cursor->levels[i].cursor);
+ }
i++;
}
free(cursor->levels);
diff --git a/libc3/types.h b/libc3/types.h
index 20a2956..31caff9 100644
--- a/libc3/types.h
+++ b/libc3/types.h
@@ -416,6 +416,7 @@ struct facts {
};
struct facts_cursor {
+ s_facts *facts;
s_skiplist__fact *index;
s_skiplist_node__fact *node;
s_fact start;
@@ -423,6 +424,7 @@ struct facts_cursor {
s_tag *var_subject;
s_tag *var_predicate;
s_tag *var_object;
+ pthread_mutex_t mutex;
};
/* 6 */
@@ -448,7 +450,7 @@ struct facts_with_cursor_level {
/* 7 */
struct facts_with_cursor {
- const s_facts *facts;
+ s_facts *facts;
s_binding *bindings;
size_t facts_count;
s_facts_with_cursor_level *levels;
diff --git a/test/facts_cursor_test.c b/test/facts_cursor_test.c
index f182a8f..7531ac0 100644
--- a/test/facts_cursor_test.c
+++ b/test/facts_cursor_test.c
@@ -64,30 +64,42 @@ void facts_cursor_test_init ()
facts_add_fact(&facts, fact + i);
i++;
}
- TEST_EQ(facts_cursor_init(&cursor, facts.index_spo, NULL, NULL),
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_spo, NULL, NULL),
&cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_pos, NULL, NULL),
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_pos, NULL, NULL),
&cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_osp, NULL, NULL),
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_osp, NULL, NULL),
&cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_spo, fact, fact),
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_spo, fact, fact),
&cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_pos, fact, fact),
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_pos, fact, fact),
&cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_osp, fact, fact),
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_osp, fact, fact),
&cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_spo, fact + 1,
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_spo, fact + 1,
fact + 1), &cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_pos, fact + 1,
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_pos, fact + 1,
fact + 1), &cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_osp, fact + 1,
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_osp, fact + 1,
fact + 1), &cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_spo, fact,
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_spo, fact,
fact + 6), &cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_pos, fact,
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_pos, fact,
fact + 6), &cursor);
- TEST_EQ(facts_cursor_init(&cursor, facts.index_osp, fact,
+ facts_cursor_clean(&cursor);
+ TEST_EQ(facts_cursor_init(&facts, &cursor, facts.index_osp, fact,
fact + 6), &cursor);
+ facts_cursor_clean(&cursor);
i = 0;
while (p[i]) {
fact_test_clean_1(fact + i);
@@ -134,46 +146,55 @@ void facts_cursor_test_next ()
facts_add_fact(&facts, fact + i);
i++;
}
- facts_cursor_init(&cursor, facts.index_spo, NULL, NULL);
+ facts_cursor_init(&facts, &cursor, facts.index_spo, NULL, NULL);
i = 0;
while (p[i]) {
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + i);
i++;
}
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_pos, NULL, NULL);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_pos, NULL, NULL);
i = 0;
while (p[i]) {
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + i);
i++;
}
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_osp, NULL, NULL);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_osp, NULL, NULL);
i = 0;
while (p[i]) {
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + i);
i++;
}
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_spo, fact, fact);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_spo, fact, fact);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_pos, fact, fact);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_pos, fact, fact);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_osp, fact, fact);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_osp, fact, fact);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_spo, fact + 1, fact + 1);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_spo, fact + 1, fact + 1);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 1);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_pos, fact + 1, fact + 1);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_pos, fact + 1, fact + 1);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 1);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_osp, fact + 1, fact + 1);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_osp, fact + 1, fact + 1);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 1);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_spo, fact, fact + 6);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_spo, fact, fact + 6);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 1);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 2);
@@ -182,7 +203,8 @@ void facts_cursor_test_next ()
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 5);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 6);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_pos, fact, fact + 6);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_pos, fact, fact + 6);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 1);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 2);
@@ -191,7 +213,8 @@ void facts_cursor_test_next ()
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 5);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 6);
TEST_EQ(facts_cursor_next(&cursor), NULL);
- facts_cursor_init(&cursor, facts.index_osp, fact, fact + 6);
+ facts_cursor_clean(&cursor);
+ facts_cursor_init(&facts, &cursor, facts.index_osp, fact, fact + 6);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 1);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 2);
@@ -200,6 +223,7 @@ void facts_cursor_test_next ()
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 5);
FACT_TEST_EQ(facts_cursor_next(&cursor), fact + 6);
TEST_EQ(facts_cursor_next(&cursor), NULL);
+ facts_cursor_clean(&cursor);
i = 0;
while (p[i]) {
fact_test_clean_1(fact + i);