Skip to content

Added flushing of reserved modifications, set_value used for initiali… #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added flushing of reserved modifications, set_value used for initiali… #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb04ceb
Added flushing of reserved modifications, set_value used for initiali…
jschmieg Jan 11, 2019
6d37108
Flushing optimization
jschmieg Jan 15, 2019
4180d5d
Minor corrections
jschmieg Jan 15, 2019
c529c39
Removing DRAIN because of PUBLISH
jschmieg Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion lib/pmem/ARTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ void TreeImpl::allocateFullLevels(persistent_ptr<Node> node,
actionsCounter++;
node256_new->depth = depth;
node256_new->type = TYPE256;
pmemobj_flush(_pm_pool.get_handle(),
pmemobj_direct(*node256_new.raw_ptr()),
sizeof(Node256));
children[i] = node256_new;
} else if (LEVEL_TYPE[depth] == TYPE_LEAF_COMPRESSED) {
nodeLeafCompressed_new = pmemobj_xreserve(
Expand All @@ -290,6 +293,12 @@ void TreeImpl::allocateFullLevels(persistent_ptr<Node> node,
nodeLeafCompressed_new->type = TYPE_LEAF_COMPRESSED;
// Temporarily disable the node
nodeLeafCompressed_new->key = -1;
pmemobj_flush(_pm_pool.get_handle(),
&nodeLeafCompressed_new->depth, sizeof(int));
pmemobj_flush(_pm_pool.get_handle(),
&nodeLeafCompressed_new->type, sizeof(int));
pmemobj_flush(_pm_pool.get_handle(),
&nodeLeafCompressed_new->key, sizeof(uint32_t));
children[i] = nodeLeafCompressed_new;
}

Expand All @@ -307,7 +316,17 @@ void TreeImpl::allocateFullLevels(persistent_ptr<Node> node,
throw OperationFailedException(Status(ALLOCATION_ERROR));
}
for (int i = 0; i < NODE_SIZE[node->type]; i++) {
node256->children[i] = children[i];
// node256->children[i] = children[i];
pmemobj_set_value(_pm_pool.get_handle(),
&(actionsArray[actionsCounter]),
&((node256->children[i]).raw_ptr()->pool_uuid_lo),
children[i].raw_ptr()->pool_uuid_lo);
actionsCounter++;
pmemobj_set_value(_pm_pool.get_handle(),
&(actionsArray[actionsCounter]),
&((node256->children[i]).raw_ptr()->off),
children[i].raw_ptr()->off);
actionsCounter++;
}
}
}
Expand Down Expand Up @@ -363,8 +382,12 @@ ValueWrapper *TreeImpl::findValueInNode(persistent_ptr<Node> current,
* the same key. This is still not thread-safe.
*/
val->location = EMPTY;
pmemobj_flush(_pm_pool.get_handle(), &(val->location),
sizeof(val->location));
// Enable the node
nodeLeafCompressed->key = keyCalc;
pmemobj_flush(_pm_pool.get_handle(), &(nodeLeafCompressed->key),
sizeof(nodeLeafCompressed->key));
return val;
} else {
DAQ_DEBUG("findValueInNode: not allocate, keyCalc=" +
Expand Down Expand Up @@ -399,6 +422,8 @@ ValueWrapper *TreeImpl::findValueInNode(persistent_ptr<Node> current,
int actionsCounter = 0;
allocateFullLevels(node256, 1, actionsArray,
actionsCounter);
// drain is not needed if we are publishing in the same
// thread pmemobj_drain(_pm_pool.get_handle());
int status = pmemobj_publish(_pm_pool.get_handle(),
actionsArray, actionsCounter);
actionsCounter = 0;
Expand Down
5 changes: 4 additions & 1 deletion lib/pmem/ARTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ const int LEVEL_TYPE[] = {TYPE256, TYPE256, TYPE256,
// how many levels will be created on ARTree initialization
const int PREALLOC_LEVELS = 1;
// size of table for actions for each Node
#define ACTION_NUMBER_NODE256 (1 + 256)
#define CHILDREN_SETTING_ACTIONS 2 * 256
#define CHILDREN_NUMBER 256
#define ACTION_NUMBER_NODE256 (1 + CHILDREN_NUMBER + CHILDREN_SETTING_ACTIONS)
#define ACTION_NUMBER_COMPRESSED 1

#define KEY_SIZE 12
Expand Down Expand Up @@ -100,6 +102,7 @@ class Node {
int depth;
// Type of Node: Node256 or compressed
int type;
std::atomic<int> counter;
};

/*
Expand Down