Merging upstream version 0.7.1 (Closes: #991419).
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
05c588e9d7
commit
9e09e0ef69
99 changed files with 6727 additions and 943 deletions
|
@ -86,12 +86,15 @@ static void *
|
|||
read_thread(void *unused CK_CC_UNUSED)
|
||||
{
|
||||
unsigned int j;
|
||||
ck_epoch_record_t record CK_CC_CACHELINE;
|
||||
ck_epoch_record_t *record CK_CC_CACHELINE;
|
||||
ck_stack_entry_t *cursor;
|
||||
ck_stack_entry_t *n;
|
||||
unsigned int i;
|
||||
|
||||
ck_epoch_register(&stack_epoch, &record);
|
||||
record = malloc(sizeof *record);
|
||||
if (record == NULL)
|
||||
ck_error("record allocation failure");
|
||||
ck_epoch_register(&stack_epoch, record, NULL);
|
||||
|
||||
if (aff_iterate(&a)) {
|
||||
perror("ERROR: failed to affine thread");
|
||||
|
@ -112,7 +115,7 @@ read_thread(void *unused CK_CC_UNUSED)
|
|||
for (;;) {
|
||||
i = 0;
|
||||
|
||||
ck_epoch_begin(&record, NULL);
|
||||
ck_epoch_begin(record, NULL);
|
||||
CK_STACK_FOREACH(&stack, cursor) {
|
||||
if (cursor == NULL)
|
||||
continue;
|
||||
|
@ -123,7 +126,7 @@ read_thread(void *unused CK_CC_UNUSED)
|
|||
if (i++ > 4098)
|
||||
break;
|
||||
}
|
||||
ck_epoch_end(&record, NULL);
|
||||
ck_epoch_end(record, NULL);
|
||||
|
||||
if (j != 0 && ck_pr_load_uint(&readers) == 0)
|
||||
ck_pr_store_uint(&readers, 1);
|
||||
|
@ -145,10 +148,13 @@ write_thread(void *unused CK_CC_UNUSED)
|
|||
{
|
||||
struct node **entry, *e;
|
||||
unsigned int i, j, tid;
|
||||
ck_epoch_record_t record;
|
||||
ck_epoch_record_t *record;
|
||||
ck_stack_entry_t *s;
|
||||
|
||||
ck_epoch_register(&stack_epoch, &record);
|
||||
record = malloc(sizeof *record);
|
||||
if (record == NULL)
|
||||
ck_error("record allocation failure");
|
||||
ck_epoch_register(&stack_epoch, record, NULL);
|
||||
|
||||
if (aff_iterate(&a)) {
|
||||
perror("ERROR: failed to affine thread");
|
||||
|
@ -180,17 +186,17 @@ write_thread(void *unused CK_CC_UNUSED)
|
|||
ck_pr_stall();
|
||||
|
||||
for (i = 0; i < PAIRS_S; i++) {
|
||||
ck_epoch_begin(&record, NULL);
|
||||
ck_epoch_begin(record, NULL);
|
||||
s = ck_stack_pop_upmc(&stack);
|
||||
e = stack_container(s);
|
||||
ck_epoch_end(&record, NULL);
|
||||
ck_epoch_end(record, NULL);
|
||||
|
||||
if (i & 1) {
|
||||
ck_epoch_synchronize(&record);
|
||||
ck_epoch_reclaim(&record);
|
||||
ck_epoch_call(&record, &e->epoch_entry, destructor);
|
||||
ck_epoch_synchronize(record);
|
||||
ck_epoch_reclaim(record);
|
||||
ck_epoch_call(record, &e->epoch_entry, destructor);
|
||||
} else {
|
||||
ck_epoch_barrier(&record);
|
||||
ck_epoch_barrier(record);
|
||||
destructor(&e->epoch_entry);
|
||||
}
|
||||
|
||||
|
@ -201,13 +207,13 @@ write_thread(void *unused CK_CC_UNUSED)
|
|||
}
|
||||
}
|
||||
|
||||
ck_epoch_synchronize(&record);
|
||||
ck_epoch_synchronize(record);
|
||||
|
||||
if (tid == 0) {
|
||||
fprintf(stderr, "[W] Peak: %u (%2.2f%%)\n Reclamations: %lu\n\n",
|
||||
record.n_peak,
|
||||
(double)record.n_peak / ((double)PAIRS_S * ITERATE_S) * 100,
|
||||
record.n_dispatch);
|
||||
fprintf(stderr, "[W] Peak: %u (%2.2f%%)\n Reclamations: %u\n\n",
|
||||
record->n_peak,
|
||||
(double)record->n_peak / ((double)PAIRS_S * ITERATE_S) * 100,
|
||||
record->n_dispatch);
|
||||
}
|
||||
|
||||
ck_pr_inc_uint(&e_barrier);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue