projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: rcuja merge fixes
[userspace-rcu.git]
/
rcuja
/
rcuja-shadow-nodes.c
diff --git
a/rcuja/rcuja-shadow-nodes.c
b/rcuja/rcuja-shadow-nodes.c
index 718c0821407c7ba9f927342b5db4e593a2a88d13..b27812e3a74429efaaa945603499a7004421a1e8 100644
(file)
--- a/
rcuja/rcuja-shadow-nodes.c
+++ b/
rcuja/rcuja-shadow-nodes.c
@@
-3,7
+3,7
@@
*
* Userspace RCU library - RCU Judy Array Shadow Node Hash Table
*
*
* Userspace RCU library - RCU Judy Array Shadow Node Hash Table
*
- * Copyright 2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2012
-2013
- Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-24,13
+24,13
@@
#include <stdint.h>
#include <errno.h>
#include <limits.h>
#include <stdint.h>
#include <errno.h>
#include <limits.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <time.h>
#include <urcu/rcuja.h>
#include <urcu/compiler.h>
#include <urcu/arch.h>
#include <urcu/rcuja.h>
#include <urcu/compiler.h>
#include <urcu/arch.h>
-#include <assert.h>
#include <urcu-pointer.h>
#include <urcu-pointer.h>
-#include <stdlib.h>
-#include <time.h>
#include "rcuja-internal.h"
#include "rcuja-internal.h"
@@
-377,8
+377,7
@@
rcu_unlock:
*/
__attribute__((visibility("protected")))
void rcuja_shadow_prune(struct cds_lfht *ht,
*/
__attribute__((visibility("protected")))
void rcuja_shadow_prune(struct cds_lfht *ht,
- unsigned int flags,
- void (*free_node_cb)(struct cds_ja_node *node))
+ unsigned int flags)
{
const struct rcu_flavor_struct *flavor;
struct cds_ja_shadow_node *shadow_node;
{
const struct rcu_flavor_struct *flavor;
struct cds_ja_shadow_node *shadow_node;
@@
-400,11
+399,6
@@
void rcuja_shadow_prune(struct cds_lfht *ht,
goto unlock;
if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
&& shadow_node->level) {
goto unlock;
if ((flags & RCUJA_SHADOW_CLEAR_FREE_NODE)
&& shadow_node->level) {
- if (shadow_node->level == shadow_node->ja->tree_depth - 1) {
- rcuja_free_all_children(shadow_node,
- shadow_node->node_flag,
- free_node_cb);
- }
if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
flavor->update_call_rcu(&shadow_node->head,
free_shadow_node_and_node_and_lock);
if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
flavor->update_call_rcu(&shadow_node->head,
free_shadow_node_and_node_and_lock);
This page took
0.023285 seconds
and
4
git commands to generate.