/*
- * Copyright 2007 Secure Endpoints Inc.
+ * Copyright 2007-2008 Secure Endpoints Inc.
*
* All Rights Reserved.
*
#include <stdlib.h>
#include <assert.h>
#include "afsd.h"
+#include <strsafe.h>
#ifdef USE_BPLUS
#include "cm_btree.h"
static void cleanupNodePool(Tree *B);
static Nptr descendToLeaf(Tree *B, Nptr curr);
-static int getSlot(Tree *B, Nptr curr);
+int getSlot(Tree *B, Nptr curr);
static int findKey(Tree *B, Nptr curr, int lo, int hi);
static int bestMatch(Tree *B, Nptr curr, int slot);
static void _xferentry(Nptr srcNode, int srcEntry, Nptr destNode, int destEntry);
static void _setentry(Nptr node, int entry, keyT key, Nptr downNode);
+/* access key and data values for B+tree methods */
+/* pass values to getSlot(), descend...() */
+static keyT getfunkey(Tree *B);
+static dataT getfundata(Tree *B);
+static void setfunkey(Tree *B, keyT v);
+static void setfundata(Tree *B, dataT v);
+
+
#ifdef DEBUG_BTREE
static int _isRoot(Tree *B, Nptr n)
{
/***********************************************************************\
| B+tree Initialization and Cleanup Routines |
\***********************************************************************/
+static DWORD TlsKeyIndex;
+static DWORD TlsDataIndex;
+
+long cm_InitBPlusDir(void)
+{
+ if ((TlsKeyIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES)
+ return 0;
+
+ if ((TlsDataIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES)
+ return 0;
+
+ return 1;
+}
/******************** Set up B+tree structure **********************/
Tree *initBtree(unsigned int poolsz, unsigned int fanout, KeyCmp keyCmp)
{
Tree *B;
keyT empty = {NULL};
- dataT data = {0,0,0,0};
+ dataT data = {0,0,0,0,0,0,0};
if (fanout > MAX_FANOUT)
fanout = MAX_FANOUT;
setcomparekeys(B, keyCmp);
#ifdef DEBUG_BTREE
- sprintf(B->message, "INIT: B+tree of fanout %d at %10p.\n", fanout, (void *)B);
+ StringCbPrintfA(B->message, sizeof(B->message), "INIT: B+tree of fanout %d at %10p.\n", fanout, (void *)B);
OutputDebugString(B->message);
#endif
void freeBtree(Tree *B)
{
#ifdef DEBUG_BTREE
- sprintf(B->message, "FREE: B+tree at %10p.\n", (void *) B);
+ StringCbPrintfA(B->message, sizeof(B->message), "FREE: B+tree at %10p.\n", (void *) B);
OutputDebugString(B->message);
#endif
}
+/* access key and data values for B+tree methods */
+/* pass values to getSlot(), descend...() */
+static keyT getfunkey(Tree *B) {
+ keyT *tlsKey;
+
+ // Retrieve a data pointer for the current thread.
+ tlsKey = (keyT *) TlsGetValue(TlsKeyIndex);
+ if (tlsKey == NULL) {
+ if (GetLastError() != ERROR_SUCCESS)
+ osi_panic("TlsGetValue failed", __FILE__, __LINE__);
+ else
+ osi_panic("get before set", __FILE__, __LINE__);
+ }
+
+ return *tlsKey;
+}
+
+static dataT getfundata(Tree *B) {
+ dataT *tlsData;
+
+ // Retrieve a data pointer for the current thread.
+ tlsData = (dataT *) TlsGetValue(TlsDataIndex);
+ if (tlsData == NULL) {
+ if (GetLastError() != ERROR_SUCCESS)
+ osi_panic("TlsGetValue failed", __FILE__, __LINE__);
+ else
+ osi_panic("get before set", __FILE__, __LINE__);
+ }
+
+ return *tlsData;
+}
+
+static void setfunkey(Tree *B, keyT theKey) {
+ keyT *tlsKey;
+
+ tlsKey = (keyT *) TlsGetValue(TlsKeyIndex);
+ if (tlsKey == NULL) {
+ if (GetLastError() != ERROR_SUCCESS)
+ osi_panic("TlsGetValue failed", __FILE__, __LINE__);
+
+ tlsKey = malloc(sizeof(keyT));
+
+ if (!TlsSetValue(TlsKeyIndex, tlsKey))
+ osi_panic("TlsSetValue failed", __FILE__, __LINE__);
+ }
+
+ *tlsKey = theKey;
+}
+
+static void setfundata(Tree *B, dataT theData) {
+ dataT *tlsData;
+
+ tlsData = (dataT *) TlsGetValue(TlsDataIndex);
+ if (tlsData == NULL) {
+ if (GetLastError() != ERROR_SUCCESS)
+ osi_panic("TlsGetValue failed", __FILE__, __LINE__);
+
+ tlsData = malloc(sizeof(dataT));
+
+ if (!TlsSetValue(TlsDataIndex, tlsData))
+ osi_panic("TlsSetValue failed", __FILE__, __LINE__);
+ }
+
+ *tlsData = theData;
+}
+
+
/***********************************************************************\
-| Find location for data |
+| Find leaf node in which data nodes can be found |
\***********************************************************************/
/********************** top level lookup **********************/
Nptr bplus_Lookup(Tree *B, keyT key)
{
- Nptr findNode;
+ Nptr leafNode;
#ifdef DEBUG_BTREE
- sprintf(B->message, "LOOKUP: key %s.\n", key.name);
+ StringCbPrintfA(B->message, sizeof(B->message), "LOOKUP: key %s.\n", key.name);
OutputDebugString(B->message);
#endif
setfunkey(B, key); /* set search key */
- findNode = descendToLeaf(B, getroot(B)); /* start search from root node */
+ leafNode = descendToLeaf(B, getroot(B)); /* start search from root node */
#ifdef DEBUG_BTREE
- if (findNode) {
+ if (leafNode) {
int slot;
Nptr dataNode;
dataT data;
- slot = findKey(B, findNode, 1, numentries(findNode));
- dataNode = getnode(findNode, slot);
+ slot = getSlot(B, leafNode);
+ if (slot <= BTERROR)
+ return NONODE;
+
+ dataNode = getnode(leafNode, slot);
data = getdatavalue(dataNode);
- sprintf(B->message, "LOOKUP: %s found on page %d value (%d.%d.%d).\n",
+ StringCbPrintfA(B->message, sizeof(B->message), "LOOKUP: %s found on page %d value (%d.%d.%d).\n",
key.name,
- getnodenumber(B, findNode),
+ getnodenumber(B, leafNode),
data.fid.volume,
data.fid.vnode,
data.fid.unique);
} else
- sprintf(B->message, "LOOKUP: not found!\n");
+ StringCbPrintfA(B->message, sizeof(B->message), "LOOKUP: not found!\n");
OutputDebugString(B->message);
#endif
- return findNode;
+ return leafNode;
}
/********************** `recurse' down B+tree **********************/
memset(prev, 0, sizeof(prev));
- for (depth = 0, slot = getSlot(B, curr); isinternal(curr); depth++, slot = getSlot(B, curr)) {
+ for (depth = 0, slot = getSlot(B, curr); (slot >= 0) && isinternal(curr); depth++, slot = getSlot(B, curr)) {
prev[depth] = curr;
if (slot == 0)
curr = getfirstnode(curr);
- else
+ else if (slot > 0)
curr = getnode(curr, slot);
+ else /* BTERROR, BTLOWER, BTUPPER */ {
+ curr = NONODE;
+ break;
+ }
#ifdef DEBUG_BTREE
if ( !isnode(curr) )
DebugBreak();
}
/******************** find slot for search key *********************/
-static int getSlot(Tree *B, Nptr curr)
+int getSlot(Tree *B, Nptr curr)
{
int slot, entries;
#ifdef DEBUG_BTREE
if (findslot == BTERROR) {
- sprintf(B->message, "Bad key ordering on node %d\n", getnodenumber(B, curr));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "FINDKEY: (lo %d hi %d) Bad key ordering on node %d (0x%p)\n",
+ lo, hi, getnodenumber(B, curr), curr);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
}
#endif
} else {
mid = (lo + hi) >> 1;
switch (findslot = bestMatch(B, curr, mid)) {
case BTLOWER: /* check lower half of range */
- findslot = findKey(B, curr, lo, mid - 1); /* never in 2-3+trees */
+ if (mid > 1)
+ findslot = findKey(B, curr, lo, mid - 1); /* never in 2-3+trees */
break;
case BTUPPER: /* check upper half of range */
- findslot = findKey(B, curr, mid + 1, hi);
+ if (mid < getfanout(B))
+ findslot = findKey(B, curr, mid + 1, hi);
break;
case BTERROR:
- sprintf(B->message, "Bad key ordering on node %d\n", getnodenumber(B, curr));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "FINDKEY: (lo %d hi %d) Bad key ordering on node %d (0x%p)\n",
+ lo, hi, getnodenumber(B, curr), curr);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
}
}
+
+ if (isleaf(curr) && findslot == 0)
+ {
+ StringCbPrintfA(B->message, sizeof(B->message), "FINDKEY: (lo %d hi %d) findslot %d is invalid for leaf nodes, bad key ordering on node %d (0x%p)\n",
+ lo, hi, findslot, getnodenumber(B, curr), curr);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ }
return findslot;
}
/************ comparison of key with a target key slot *************/
static int bestMatch(Tree *B, Nptr curr, int slot)
{
- int diff, comp, findslot;
+ int diff, comp=2, findslot;
diff = comparekeys(B)(getfunkey(B), getkey(curr, slot), 0);
- if (diff < 0) { /* also check previous slot */
- if ((slot == 1) ||
- ((comp = comparekeys(B)(getfunkey(B), getkey(curr, slot - 1), 0)) >= 0))
- {
+ if (diff == 0) {
+ findslot = slot;
+ } else if (diff < 0) { /* also check previous slot */
+ if (slot == 1) {
+ if (isleaf(curr))
+ findslot = BTLOWER; /* not found in the tree */
+ else
+ findslot = 0;
+ }
+ else if ((comp = comparekeys(B)(getfunkey(B), getkey(curr, slot - 1), 0)) >= 0) {
findslot = slot - 1;
- }
- else if (comp < diff) {
+ } else if (comp < diff) {
findslot = BTERROR; /* inconsistent ordering of keys */
#ifdef DEBUG_BTREE
DebugBreak();
#endif
- }
- else {
+ } else {
findslot = BTLOWER; /* key must be below in node ordering */
}
} else { /* or check following slot */
- if ((slot == numentries(curr)) ||
- ((comp = comparekeys(B)(getfunkey(B), getkey(curr, slot + 1), 0)) < 0))
- {
+ if (slot == numentries(curr)) {
+ if (isleaf(curr) && numentries(curr) == getfanout(B))
+ findslot = BTUPPER;
+ else
+ findslot = slot;
+ } else if ((comp = comparekeys(B)(getfunkey(B), getkey(curr, slot + 1), 0)) < 0) {
findslot = slot;
- }
- else if (comp == 0) {
+ } else if (comp == 0) {
findslot = slot + 1;
- }
- else if (comp > diff) {
+ } else if (comp > diff) {
findslot = BTERROR; /* inconsistent ordering of keys */
#ifdef DEBUG_BTREE
DebugBreak();
#endif
- }
- else {
+ } else {
findslot = BTUPPER; /* key must be above in node ordering */
}
}
+
+ if (findslot == BTERROR || isleaf(curr) && findslot == 0)
+ {
+ StringCbPrintfA(B->message, sizeof(B->message), "BESTMATCH: node %d (0x%p) slot %d diff %d comp %d findslot %d\n",
+ getnodenumber(B, curr), curr, slot, diff, comp, findslot);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ }
return findslot;
}
Nptr newNode;
#ifdef DEBUG_BTREE
- sprintf(B->message, "INSERT: key %s.\n", key.name);
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "INSERT: key %s.\n", key.name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
setfunkey(B, key); /* set insertion key */
setsplitpath(B, curr); /* indicates where nodes must split */
slot = getSlot(B, curr); /* is null only if the root is empty */
+ if (slot == BTERROR)
+ return NONODE;
+
+ if (isleaf(curr)) {
+ if (slot == BTLOWER)
+ slot = 0;
+ else if (slot == BTUPPER)
+ slot = getfanout(B);
+ }
+
if (isinternal(curr)) { /* continue recursion to leaves */
if (slot == 0)
downNode = descendSplit(B, getfirstnode(curr));
keyT key;
#ifdef DEBUG_BTREE
- sprintf(B->message, "INSERT: slot %d, down node %d.\n", slot, getnodenumber(B, downPtr));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "INSERT: slot %d, down node %d.\n", slot, getnodenumber(B, downPtr));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
if (sibling == NONODE) { /* no split occurred */
Nptr newNode;
#ifdef DEBUG_BTREE
- sprintf(B->message, "DELETE: key %s.\n", key.name);
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "DELETE: key %s.\n", key.name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
setfunkey(B, key); /* set deletion key */
newNode = descendBalance(B, getroot(B), NONODE, NONODE, NONODE, NONODE, NONODE);
if (isnode(newNode)) {
#ifdef DEBUG_BTREE
- sprintf(B->message, "DELETE: collapsing node %d", getnodenumber(B, newNode));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "DELETE: collapsing node %d", getnodenumber(B, newNode));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
collapseRoot(B, getroot(B), newNode); /* remove root when superfluous */
}
{
#ifdef DEBUG_BTREE
- sprintf(B->message, "COLLAPSE: old %d, new %d.\n", getnodenumber(B, oldRoot), getnodenumber(B, newRoot));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "COLLAPSE: old %d, new %d.\n", getnodenumber(B, oldRoot), getnodenumber(B, newRoot));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
showNode(B, "collapseRoot oldRoot", oldRoot);
showNode(B, "collapseRoot newRoot", newRoot);
#endif
int slot = 0, notleft = 0, notright = 0, fewleft = 0, fewright = 0, test = 0;
#ifdef DEBUG_BTREE
- sprintf(B->message, "descendBalance curr %d, left %d, right %d, lAnc %d, rAnc %d, parent %d\n",
+ StringCbPrintfA(B->message, sizeof(B->message), "descendBalance curr %d, left %d, right %d, lAnc %d, rAnc %d, parent %d\n",
curr ? getnodenumber(B, curr) : -1,
left ? getnodenumber(B, left) : -1,
right ? getnodenumber(B, right) : -1,
lAnc ? getnodenumber(B, lAnc) : -1,
rAnc ? getnodenumber(B, rAnc) : -1,
parent ? getnodenumber(B, parent) : -1);
- OutputDebugString(B->message);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
if (!isfew(curr))
setmergepath(B, curr); /* mark which nodes may need rebalancing */
slot = getSlot(B, curr);
+ if (slot == BTERROR)
+ return NONODE;
+
+ if (isleaf(curr)) {
+ if (slot == BTLOWER)
+ slot = 0;
+ else if (slot == BTUPPER)
+ slot = getfanout(B);
+ }
if (isinternal(curr)) /* set up next recursion call's parameters */
{
* options. So we must determine if any of the next nodes
* are the one we are looking for.
*/
- Nptr dataNode = newNode;
+ Nptr prev = newNode;
while ( next ) {
if (!comparekeys(B)(getfunkey(B), getdatakey(next), EXACT_MATCH)) {
/* we found the one to delete */
- getdatanext(dataNode) = getdatanext(next);
+ getdatanext(prev) = getdatanext(next);
putFreeNode(B, next);
+ break;
}
+ prev = next;
+ next = getdatanext(next);
}
/* do not delete the key */
if (newMe != NONODE) { /* this node removal doesn't consider duplicates */
#ifdef DEBUG_BTREE
- sprintf(B->message, "descendBalance DELETE: slot %d, node %d.\n", slot, getnodenumber(B, curr));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "descendBalance DELETE: slot %d, node %d.\n", slot, getnodenumber(B, curr));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
removeEntry(B, curr, slot + (newMe != newNode)); /* removes one of two */
}
#ifdef DEBUG_BTREE
- sprintf(B->message, "descendBalance returns %d\n", getnodenumber(B, newNode));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "descendBalance returns %d\n", getnodenumber(B, newNode));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#endif
return newNode;
}
int x, y, z;
#ifdef DEBUG_BTREE
- sprintf(B->message, "MERGE: left %d, right %d.\n", getnodenumber(B, left), getnodenumber(B, right));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "MERGE: left %d, right %d.\n", getnodenumber(B, left), getnodenumber(B, right));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
showNode(B, "pre-merge anchor", anchor);
showNode(B, "pre-merge left", left);
showNode(B, "pre-merge right", right);
#endif
setfunkey(B, getkey(right, 1)); /* defined but maybe just deleted */
z = getSlot(B, anchor); /* needs the just calculated key */
+ if (z <= BTERROR)
+ return NONODE;
setfunkey(B, getkey(anchor, z)); /* set slot to delete in anchor */
setentry(left, numentries(left), getfunkey(B), getfirstnode(right));
}
int i, x, y, z;
#ifdef DEBUG_BTREE
- sprintf(B->message, "SHIFT: left %d, right %d, anchor %d.\n",
+ StringCbPrintfA(B->message, sizeof(B->message), "SHIFT: left %d, right %d, anchor %d.\n",
getnodenumber(B, left),
getnodenumber(B, right),
getnodenumber(B, anchor));
- OutputDebugString(B->message);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
showNode(B, "pre-shift anchor", anchor);
showNode(B, "pre-shift left", left);
showNode(B, "pre-shift right", right);
x = numentries(left) + y;
setfunkey(B, getkey(right, y + 1 - i)); /* set new anchor key value */
z = getSlot(B, anchor); /* find slot in anchor node */
+ if (z <= BTERROR)
+ return NONODE;
#ifdef DEBUG_BTREE
if (z == 0 && !isroot(anchor))
DebugBreak();
pushentry(right, z, y);
setfunkey(B, getkey(left, x)); /* set new anchor key value */
- z = getSlot(B, anchor) + 1;
+ z = getSlot(B, anchor);
+ if (z <= BTERROR)
+ return NONODE;
+ z += 1;
+
if (i) {
decentries(left);
incentries(right);
setmergepath(B, NONODE);
#ifdef DEBUG_BTREE
- sprintf(B->message, "SHIFT: left %d, right %d.\n", getnodenumber(B, left), getnodenumber(B, right));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "SHIFT: left %d, right %d.\n", getnodenumber(B, left), getnodenumber(B, right));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
showNode(B, "post-shift anchor", anchor);
showNode(B, "post-shift left", left);
showNode(B, "post-shift right", right);
if (entry == 0)
DebugBreak();
#endif
- getkey(node,entry + offset).name = strdup(getkey(node,entry).name);
+ getkey(node,entry + offset).name = cm_NormStrDup(getkey(node,entry).name);
#ifdef DEBUG_BTREE
if ( getnode(node, entry) == NONODE )
DebugBreak();
{
if (getkey(node,entry).name != NULL)
free(getkey(node,entry).name);
- getkey(node,entry).name = strdup(getkey(node,entry + offset).name);
+ getkey(node,entry).name = cm_NormStrDup(getkey(node,entry + offset).name);
#ifdef DEBUG_BTREE
if ( getnode(node, entry + offset) == NONODE )
DebugBreak();
{
if (getkey(destNode,destEntry).name != NULL)
free(getkey(destNode,destEntry).name);
- getkey(destNode,destEntry).name = strdup(getkey(srcNode,srcEntry).name);
+ getkey(destNode,destEntry).name = cm_NormStrDup(getkey(srcNode,srcEntry).name);
#ifdef DEBUG_BTREE
if ( getnode(srcNode, srcEntry) == NONODE )
DebugBreak();
{
if (getkey(node,entry).name != NULL)
free(getkey(node,entry).name);
- getkey(node,entry).name = strdup(key.name);
+ getkey(node,entry).name = cm_NormStrDup(key.name);
#ifdef DEBUG_BTREE
if ( downNode == NONODE )
DebugBreak();
free(getdatakey(node).name);
getdatakey(node).name = NULL;
}
- if ( getdatavalue(node).longname ) {
- free(getdatavalue(node).longname);
- getdatavalue(node).longname = NULL;
+ if ( getdatavalue(node).cname ) {
+ free(getdatavalue(node).cname);
+ getdatavalue(node).cname = NULL;
+ }
+ if ( getdatavalue(node).fsname ) {
+ free(getdatavalue(node).fsname);
+ getdatavalue(node).fsname = NULL;
}
} else { /* data node */
for ( j=1; j<=getfanout(B); j++ ) {
if (isdata(node)) {
if ( getdatakey(node).name )
free(getdatakey(node).name);
+ if ( getdatavalue(node).cname )
+ free(getdatavalue(node).cname);
+ if ( getdatavalue(node).fsname )
+ free(getdatavalue(node).fsname);
} else { /* data node */
for ( i=1; i<=getfanout(B); i++ ) {
if (getkey(node, i).name)
Nptr newNode = getFreeNode(B);
setflag(newNode, isDATA);
- getdatakey(newNode).name = strdup(key.name);
+ getdatakey(newNode).name = cm_NormStrDup(key.name);
getdatavalue(newNode) = data;
getdatanext(newNode) = NONODE;
{
int x;
- sprintf(B->message, "- -- -- -- -- -- -- -- -- -- -- -- -\n");
- OutputDebugString(B->message);
- sprintf(B->message, "| %-20s |\n", where);
- OutputDebugString(B->message);
- sprintf(B->message, "| node %6d ", getnodenumber(B, n));
- OutputDebugString(B->message);
- sprintf(B->message, " magic %4x |\n", getmagic(n));
- OutputDebugString(B->message);
- sprintf(B->message, "- -- -- -- -- -- -- -- -- -- -- -- -\n");
- OutputDebugString(B->message);
- sprintf(B->message, "| flags %1d%1d%1d%1d ", isfew(n), isfull(n), isroot(n), isleaf(n));
- OutputDebugString(B->message);
- sprintf(B->message, "| keys = %5d ", numentries(n));
- OutputDebugString(B->message);
- sprintf(B->message, "| node = %6d |\n", getnodenumber(B, getfirstnode(n)));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "- -- -- -- -- -- -- -- -- -- -- -- -\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| %-20s |\n", where);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| node %6d ", getnodenumber(B, n));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), " magic %4x |\n", getmagic(n));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "- -- -- -- -- -- -- -- -- -- -- -- -\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| flags %1d%1d%1d%1d ", isfew(n), isfull(n), isroot(n), isleaf(n));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| keys = %5d ", numentries(n));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| node = %6d |\n", getnodenumber(B, getfirstnode(n)));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
for (x = 1; x <= numentries(n); x++) {
- sprintf(B->message, "| entry %6d ", x);
- OutputDebugString(B->message);
- sprintf(B->message, "| key = %6s ", getkey(n, x).name);
- OutputDebugString(B->message);
- sprintf(B->message, "| node = %6d |\n", getnodenumber(B, getnode(n, x)));
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "| entry %6d ", x);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| key = %6s ", getkey(n, x).name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| node = %6d |\n", getnodenumber(B, getnode(n, x)));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
}
- sprintf(B->message, "- -- -- -- -- -- -- -- -- -- -- -- -\n");
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "- -- -- -- -- -- -- -- -- -- -- -- -\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
}
/****************** B+tree class variable printer ******************/
void showBtree(Tree *B)
{
- sprintf(B->message, "- -- -- -- -- -- -\n");
- OutputDebugString(B->message);
- sprintf(B->message, "| B+tree %10p |\n", (void *) B);
- OutputDebugString(B->message);
- sprintf(B->message, "- -- -- -- -- -- -\n");
- OutputDebugString(B->message);
- sprintf(B->message, "| root %6d |\n", getnodenumber(B, getroot(B)));
- OutputDebugString(B->message);
- sprintf(B->message, "| leaf %6d |\n", getnodenumber(B, getleaf(B)));
- OutputDebugString(B->message);
- sprintf(B->message, "| fanout %3d |\n", getfanout(B) + 1);
- OutputDebugString(B->message);
- sprintf(B->message, "| minfanout %3d |\n", getminfanout(B, getroot(B)) + 1);
- OutputDebugString(B->message);
- sprintf(B->message, "| height %3d |\n", gettreeheight(B));
- OutputDebugString(B->message);
- sprintf(B->message, "| freenode %6d |\n", getnodenumber(B, getfirstfreenode(B)));
- OutputDebugString(B->message);
- sprintf(B->message, "| theKey %6s |\n", getfunkey(B).name);
- OutputDebugString(B->message);
- sprintf(B->message, "| theData %d.%d.%d |\n", getfundata(B).volume,
+ StringCbPrintfA(B->message, sizeof(B->message), "- -- -- -- -- -- -\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| B+tree %10p |\n", (void *) B);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "- -- -- -- -- -- -\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| root %6d |\n", getnodenumber(B, getroot(B)));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| leaf %6d |\n", getnodenumber(B, getleaf(B)));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| fanout %3d |\n", getfanout(B) + 1);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| minfanout %3d |\n", getminfanout(B, getroot(B)) + 1);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| height %3d |\n", gettreeheight(B));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| freenode %6d |\n", getnodenumber(B, getfirstfreenode(B)));
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| theKey %6s |\n", getfunkey(B).name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "| theData %d.%d.%d |\n", getfundata(B).volume,
getfundata(B).vnode, getfundata(B).unique);
- OutputDebugString(B->message);
- sprintf(B->message, "- -- -- -- -- -- -\n");
- OutputDebugString(B->message);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
+ StringCbPrintfA(B->message, sizeof(B->message), "- -- -- -- -- -- -\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
}
void
dataT data;
if (isntnode(node)) {
- sprintf(B->message, "%s - NoNode!!!\n");
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "%s - NoNode!!!\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
return;
}
if (!isnode(node))
{
data = getdatavalue(node);
- sprintf(B->message, "%s - data node %d (%d.%d.%d)\n",
+ StringCbPrintfA(B->message, sizeof(B->message), "%s - data node %d (%d.%d.%d)\n",
parent_desc, getnodenumber(B, node),
data.fid.volume, data.fid.vnode, data.fid.unique);
- OutputDebugString(B->message);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
return;
} else
showNode(B, parent_desc, node);
if ( isinternal(node) || isroot(node) ) {
- sprintf(thisnode, "parent %6d", getnodenumber(B , node));
+ StringCbPrintfA(thisnode, sizeof(thisnode), "parent %6d", getnodenumber(B , node));
- OutputDebugString(B->message);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
for ( i= isinternal(node) ? 0 : 1; i <= numentries(node); i++ ) {
listBtreeNodes(B, thisnode, i == 0 ? getfirstnode(node) : getnode(node, i));
}
listBtreeValues(Tree *B, Nptr n, int num)
{
int slot;
- keyT prev = {""};
+ keyT prev = {L""};
dataT data;
for (slot = 1; (n != NONODE) && num && numentries(n); num--) {
if (comparekeys(B)(getkey(n, slot),prev, 0) < 0) {
- sprintf(B->message, "BOMB %8s\n", getkey(n, slot).name);
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message), "BOMB %8s\n", getkey(n, slot).name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
DebugBreak();
}
prev = getkey(n, slot);
data = getdatavalue(getnode(n, slot));
- sprintf(B->message, "%8s (%d.%d.%d)\n",
+ StringCbPrintfA(B->message, sizeof(B->message), "%8S (%d.%d.%d)\n",
prev.name, data.fid.volume, data.fid.vnode, data.fid.unique);
- OutputDebugString(B->message);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
if (++slot > numentries(n))
n = getnextnode(n), slot = 1;
- }
- sprintf(B->message, "\n\n");
- OutputDebugString(B->message);
+ }
+ StringCbPrintfA(B->message, sizeof(B->message), "\n\n");
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
}
/******************** entire B+tree data printer *******************/
int num = -1;
Nptr n = getleaf(B), l;
int slot;
- keyT prev = {""};
+ keyT prev = {L""};
for (slot = 1; (n != NONODE) && num && numentries(n); num--) {
if (comparekeys(B)(getkey(n, slot),prev, 0) < 0) {
- sprintf(B->message,"BOMB %8s\n", getkey(n, slot).name);
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message),"BOMB %8s\n", getkey(n, slot).name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#ifdef DEBUG_BTREE
DebugBreak();
#endif
l = bplus_Lookup(B, prev);
if ( l != n ){
if (l == NONODE)
- sprintf(B->message,"BOMB %8s cannot be found\n", prev.name);
+ StringCbPrintfA(B->message, sizeof(B->message),"BOMB %8S cannot be found\n", prev.name);
else
- sprintf(B->message,"BOMB lookup(%8s) finds wrong node\n", prev.name);
- OutputDebugString(B->message);
+ StringCbPrintfA(B->message, sizeof(B->message),"BOMB lookup(%8S) finds wrong node\n", prev.name);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, B->message));
#ifdef DEBUG_BTREE
DebugBreak();
#endif
/*
* the return must be -1, 0, or 1. stricmp() in MSVC 8.0
* does not return only those values.
+ *
+ * the sorting of the tree is by case insensitive sort order
+ * therefore, unless the strings actually match via a case
+ * insensitive search do we want to perform the case sensitive
+ * match. Otherwise, the search order might be considered
+ * to be inconsistent when the EXACT_MATCH flag is set.
*/
-static int
-compareKeys(keyT key1, keyT key2, int flags)
+int
+cm_BPlusCompareNormalizedKeys(keyT key1, keyT key2, int flags)
{
int comp;
- if (flags & EXACT_MATCH)
- comp = strcmp(key1.name, key2.name);
- else
- comp = stricmp(key1.name, key2.name);
+ comp = cm_NormStrCmpI(key1.name, key2.name);
+ if (comp == 0 && (flags & EXACT_MATCH))
+ comp = cm_NormStrCmp(key1.name, key2.name);
return (comp < 0 ? -1 : (comp > 0 ? 1 : 0));
}
+int
+cm_BPlusDirLookupOriginalName(cm_dirOp_t * op, clientchar_t *centry,
+ fschar_t **fsnameRetp)
+{
+ int rc = EINVAL;
+ keyT key = {NULL};
+ Nptr leafNode = NONODE;
+ LARGE_INTEGER start, end;
+ fschar_t * fsname = NULL;
+ normchar_t * entry = NULL;
+
+ if (op->scp->dirBplus == NULL ||
+ op->dataVersion > op->scp->dirDataVersion) {
+ rc = EINVAL;
+ goto done;
+ }
+
+ entry = cm_ClientStringToNormStringAlloc(centry, -1, NULL);
+ if (!entry) {
+ rc = EINVAL;
+ goto done;
+ }
+ key.name = entry;
+
+ lock_AssertAny(&op->scp->dirlock);
+
+ QueryPerformanceCounter(&start);
+
+ leafNode = bplus_Lookup(op->scp->dirBplus, key);
+ if (leafNode != NONODE) {
+ int slot;
+ Nptr firstDataNode, dataNode, nextDataNode;
+ int exact = 0;
+ int count = 0;
+
+ /* Found a leaf that matches the key via a case-insensitive
+ * match. There may be one or more data nodes that match.
+ * If we have an exact match, return that.
+ * If we have an ambiguous match, return an error.
+ * If we have only one inexact match, return that.
+ */
+ slot = getSlot(op->scp->dirBplus, leafNode);
+ if (slot <= BTERROR) {
+ op->scp->dirDataVersion = 0;
+ rc = (slot == BTERROR ? EINVAL : ENOENT);
+ goto done;
+ }
+ firstDataNode = getnode(leafNode, slot);
+
+ for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) {
+ count++;
+ if (!comparekeys(op->scp->dirBplus)(key, getdatakey(dataNode), EXACT_MATCH) ) {
+ exact = 1;
+ break;
+ }
+ nextDataNode = getdatanext(dataNode);
+ }
+
+ if (exact) {
+ fsname = getdatavalue(dataNode).fsname;
+ rc = 0;
+ bplus_lookup_hits++;
+ } else if (count == 1) {
+ fsname = getdatavalue(firstDataNode).fsname;
+ rc = CM_ERROR_INEXACT_MATCH;
+ bplus_lookup_hits_inexact++;
+ } else {
+ rc = CM_ERROR_AMBIGUOUS_FILENAME;
+ bplus_lookup_ambiguous++;
+ }
+ } else {
+ rc = ENOENT;
+ bplus_lookup_misses++;
+ }
+
+ if (fsname)
+ *fsnameRetp = cm_FsStrDup(fsname);
+
+ QueryPerformanceCounter(&end);
+
+ bplus_lookup_time += (end.QuadPart - start.QuadPart);
+
+ done:
+ if (entry)
+ free(entry);
+
+ return rc;
+
+}
+
/* Look up a file name in directory.
On entry:
op->scp->dirlock is read locked
*/
int
-cm_BPlusDirLookup(cm_dirOp_t * op, char *entry, cm_fid_t * cfid)
+cm_BPlusDirLookup(cm_dirOp_t * op, clientchar_t * centry, cm_fid_t * cfid)
{
int rc = EINVAL;
- keyT key = {entry};
+ normchar_t * entry = NULL;
+ keyT key = {NULL};
Nptr leafNode = NONODE;
LARGE_INTEGER start, end;
if (op->scp->dirBplus == NULL ||
- op->dataVersion != op->scp->dirDataVersion) {
+ op->dataVersion > op->scp->dirDataVersion) {
rc = EINVAL;
goto done;
}
+ entry = cm_ClientStringToNormStringAlloc(centry, -1, NULL);
+ if (!entry) {
+ rc = EINVAL;
+ goto done;
+ }
+ key.name = entry;
+
+ lock_AssertAny(&op->scp->dirlock);
+
QueryPerformanceCounter(&start);
leafNode = bplus_Lookup(op->scp->dirBplus, key);
* If we have an ambiguous match, return an error.
* If we have only one inexact match, return that.
*/
- slot = findKey(op->scp->dirBplus, leafNode, 1, numentries(leafNode));
+ slot = getSlot(op->scp->dirBplus, leafNode);
+ if (slot <= BTERROR) {
+ op->scp->dirDataVersion = 0;
+ rc = (slot == BTERROR ? EINVAL : ENOENT);
+ goto done;
+ }
firstDataNode = getnode(leafNode, slot);
for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) {
bplus_lookup_time += (end.QuadPart - start.QuadPart);
done:
+ if (entry)
+ free(entry);
+
return rc;
}
On exit:
op->scp->dirlock is write locked
*/
-long cm_BPlusDirCreateEntry(cm_dirOp_t * op, char *entry, cm_fid_t * cfid)
+long cm_BPlusDirCreateEntry(cm_dirOp_t * op, clientchar_t * entry, cm_fid_t * cfid)
{
long rc = 0;
- keyT key = {entry};
+ keyT key = {NULL};
dataT data;
LARGE_INTEGER start, end;
- char shortName[13];
+ normchar_t * normalizedName = NULL;
if (op->scp->dirBplus == NULL ||
op->dataVersion != op->scp->dirDataVersion) {
goto done;
}
- data.fid.cell = cfid->cell;
- data.fid.volume = cfid->volume;
- data.fid.vnode = cfid->vnode;
- data.fid.unique = cfid->unique;
- data.longname = NULL;
+ normalizedName = cm_ClientStringToNormStringAlloc(entry, -1, NULL);
+ if (!normalizedName) {
+ rc = EINVAL;
+ goto done;
+ }
+ key.name = normalizedName;
+
+ lock_AssertWrite(&op->scp->dirlock);
+
+ cm_SetFid(&data.fid, cfid->cell, cfid->volume, cfid->vnode, cfid->unique);
+ data.cname = cm_ClientStrDup(entry);
+ data.fsname = cm_ClientStringToFsStringAlloc(entry, -1, NULL);
+ data.shortform = FALSE;
QueryPerformanceCounter(&start);
bplus_create_entry++;
insert(op->scp->dirBplus, key, data);
+
if (!cm_Is8Dot3(entry)) {
cm_dirFid_t dfid;
+ clientchar_t wshortName[13];
+
dfid.vnode = htonl(data.fid.vnode);
dfid.unique = htonl(data.fid.unique);
- cm_Gen8Dot3NameInt(entry, &dfid, shortName, NULL);
+ cm_Gen8Dot3NameIntW(entry, &dfid, wshortName, NULL);
+
+ key.name = wshortName;
+
+ data.cname = cm_ClientStrDup(entry);
+ data.fsname = cm_ClientStringToFsStringAlloc(entry, -1, NULL);
+ data.shortform = TRUE;
- key.name = shortName;
- data.longname = strdup(entry);
insert(op->scp->dirBplus, key, data);
}
done:
+ if (normalizedName != NULL)
+ free(normalizedName);
+
return rc;
}
On exit:
op->scp->dirlock is write locked
*/
-int cm_BPlusDirDeleteEntry(cm_dirOp_t * op, char *entry)
+int cm_BPlusDirDeleteEntry(cm_dirOp_t * op, clientchar_t *centry)
{
long rc = 0;
- keyT key = {entry};
+ keyT key = {NULL};
Nptr leafNode = NONODE;
LARGE_INTEGER start, end;
+ normchar_t * normalizedEntry = NULL;
if (op->scp->dirBplus == NULL ||
op->dataVersion != op->scp->dirDataVersion) {
goto done;
}
+ normalizedEntry = cm_ClientStringToNormStringAlloc(centry, -1, NULL);
+ if (!normalizedEntry) {
+ rc = EINVAL;
+ goto done;
+ }
+ key.name = normalizedEntry;
+
+ lock_AssertWrite(&op->scp->dirlock);
+
QueryPerformanceCounter(&start);
bplus_remove_entry++;
if (op->scp->dirBplus) {
- if (!cm_Is8Dot3(entry)) {
+ if (!cm_Is8Dot3(centry)) {
cm_dirFid_t dfid;
cm_fid_t fid;
- char shortName[13];
+ clientchar_t shortName[13];
leafNode = bplus_Lookup(op->scp->dirBplus, key);
if (leafNode != NONODE) {
* If we have an ambiguous match, return an error.
* If we have only one inexact match, return that.
*/
- slot = findKey(op->scp->dirBplus, leafNode, 1, numentries(leafNode));
+ slot = getSlot(op->scp->dirBplus, leafNode);
+ if (slot <= BTERROR) {
+ op->scp->dirDataVersion = 0;
+ rc = EINVAL;
+ goto done;
+ }
firstDataNode = getnode(leafNode, slot);
for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) {
if (rc != CM_ERROR_AMBIGUOUS_FILENAME) {
dfid.vnode = htonl(fid.vnode);
dfid.unique = htonl(fid.unique);
- cm_Gen8Dot3NameInt(entry, &dfid, shortName, NULL);
+ cm_Gen8Dot3NameIntW(centry, &dfid, shortName, NULL);
/* delete first the long name and then the short name */
delete(op->scp->dirBplus, key);
delete(op->scp->dirBplus, key);
}
} else {
- char * longname = NULL;
+ clientchar_t * cname = NULL;
+
/* We need to lookup the 8dot3 name to determine what the
* matching long name is
*/
* If we have an ambiguous match, return an error.
* If we have only one inexact match, return that.
*/
- slot = findKey(op->scp->dirBplus, leafNode, 1, numentries(leafNode));
+ slot = getSlot(op->scp->dirBplus, leafNode);
+ if (slot <= BTERROR) {
+ op->scp->dirDataVersion = 0;
+ rc = EINVAL;
+ goto done;
+
+ }
firstDataNode = getnode(leafNode, slot);
for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) {
}
if (exact) {
- longname = getdatavalue(dataNode).longname;
+ cname = getdatavalue(dataNode).cname;
rc = 0;
} else if (count == 1) {
- longname = getdatavalue(firstDataNode).longname;
+ cname = getdatavalue(firstDataNode).cname;
rc = CM_ERROR_INEXACT_MATCH;
} else {
rc = CM_ERROR_AMBIGUOUS_FILENAME;
}
if (rc != CM_ERROR_AMBIGUOUS_FILENAME) {
- if (longname) {
- key.name = longname;
- delete(op->scp->dirBplus, key);
- key.name = entry;
- }
+ if (cname) {
+ normchar_t * longNName = cm_NormalizeStringAlloc(cname, -1, NULL);
+
+ key.name = longNName;
+ delete(op->scp->dirBplus, key);
+ key.name = normalizedEntry;
+
+ free(longNName);
+ }
+
delete(op->scp->dirBplus, key);
}
}
bplus_remove_time += (end.QuadPart - start.QuadPart);
done:
+ if (normalizedEntry)
+ free(normalizedEntry);
+
return rc;
}
int cm_BPlusDirFoo(struct cm_scache *scp, struct cm_dirEntry *dep,
void *dummy, osi_hyper_t *entryOffsetp)
{
- keyT key = {dep->name};
+ keyT key = {NULL};
dataT data;
- char shortName[13];
+ normchar_t *normalized_name=NULL;
+
+ cm_SetFid(&data.fid, scp->fid.cell, scp->fid.volume,
+ ntohl(dep->fid.vnode), ntohl(dep->fid.unique));
+ data.cname = NULL;
+ data.fsname = NULL;
- data.fid.cell = scp->fid.cell;
- data.fid.volume = scp->fid.volume;
- data.fid.vnode = ntohl(dep->fid.vnode);
- data.fid.unique = ntohl(dep->fid.unique);
- data.longname = NULL;
+ normalized_name = cm_FsStringToNormStringAlloc(dep->name, -1, NULL);
+
+ if (normalized_name) {
+ key.name = normalized_name;
+ } else {
+#ifdef DEBUG
+ DebugBreak();
+#endif
+ return 0;
+ }
+
+ data.cname = cm_FsStringToClientStringAlloc(dep->name, -1, NULL);
+ if (data.cname == NULL) {
+#ifdef DEBUG
+ DebugBreak();
+#endif
+ return 0;
+ }
+ data.fsname = cm_FsStrDup(dep->name);
+ data.shortform = FALSE;
/* the Write lock is held in cm_BPlusDirBuildTree() */
insert(scp->dirBplus, key, data);
- if (!cm_Is8Dot3(dep->name)) {
+
+ if (!cm_Is8Dot3(data.cname)) {
cm_dirFid_t dfid;
+ wchar_t wshortName[13];
+
dfid.vnode = dep->fid.vnode;
dfid.unique = dep->fid.unique;
- cm_Gen8Dot3NameInt(dep->name, &dfid, shortName, NULL);
+ cm_Gen8Dot3NameIntW(data.cname, &dfid, wshortName, NULL);
+
+ key.name = wshortName;
+ data.cname = cm_FsStringToClientStringAlloc(dep->name, -1, NULL);
+ if (data.cname) {
+ data.fsname = cm_FsStrDup(dep->name);
+ data.shortform = TRUE;
- key.name = shortName;
- data.longname = strdup(dep->name);
- insert(scp->dirBplus, key, data);
+ insert(scp->dirBplus, key, data);
+ }
}
+ if (normalized_name)
+ free(normalized_name);
+
#ifdef BTREE_DEBUG
findAllBtreeValues(scp->dirBplus);
#endif
osi_hyper_t thyper;
LARGE_INTEGER start, end;
- osi_assert(scp->dirBplus == NULL);
+ osi_assertx(scp->dirBplus == NULL, "cm_BPlusDirBuildTree called on non-empty tree");
+
+ lock_AssertWrite(&scp->dirlock);
QueryPerformanceCounter(&start);
bplus_build_tree++;
if (scp->dirBplus == NULL) {
- scp->dirBplus = initBtree(64, MAX_FANOUT, compareKeys);
+ scp->dirBplus = initBtree(64, MAX_FANOUT, cm_BPlusCompareNormalizedKeys);
}
if (scp->dirBplus == NULL) {
rc = ENOMEM;
bplus_build_time += (end.QuadPart - start.QuadPart);
+#if 0
+ cm_BPlusDirEnumTest(scp, 1);
+#endif
return rc;
}
+int cm_MemDumpBPlusStats(FILE *outputFile, char *cookie, int lock)
+{
+ int zilch;
+ char output[128];
+
+ StringCbPrintfA(output, sizeof(output), "%s - B+ Lookup Hits: %-8d\r\n", cookie, bplus_lookup_hits);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Inexact Hits: %-8d\r\n", cookie, bplus_lookup_hits_inexact);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Ambiguous Hits: %-8d\r\n", cookie, bplus_lookup_ambiguous);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Misses: %-8d\r\n", cookie, bplus_lookup_misses);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Create: %-8d\r\n", cookie, bplus_create_entry);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Remove: %-8d\r\n", cookie, bplus_remove_entry);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Build Tree: %-8d\r\n", cookie, bplus_build_tree);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Free Tree: %-8d\r\n", cookie, bplus_free_tree);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - DV Error: %-8d\r\n", cookie, bplus_dv_error);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+
+ StringCbPrintfA(output, sizeof(output), "%s - B+ Time Lookup: %-16I64d\r\n", cookie, bplus_lookup_time);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Create: %-16I64d\r\n", cookie, bplus_create_time);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Remove: %-16I64d\r\n", cookie, bplus_remove_time);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Build: %-16I64d\r\n", cookie, bplus_build_time);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+ StringCbPrintfA(output, sizeof(output), "%s - Free: %-16I64d\r\n", cookie, bplus_free_time);
+ WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
+
+ return(0);
+}
+
void cm_BPlusDumpStats(void)
{
afsi_log("B+ Lookup Hits: %-8d", bplus_lookup_hits);
afsi_log(" Build: %-16I64d", bplus_build_time);
afsi_log(" Free: %-16I64d", bplus_free_time);
}
+
+static cm_direnum_t *
+cm_BPlusEnumAlloc(afs_uint32 entries)
+{
+ cm_direnum_t * enump;
+ size_t size;
+
+ if (entries == 0)
+ return NULL;
+
+ size = sizeof(cm_direnum_t)+(entries-1)*sizeof(cm_direnum_entry_t);
+ enump = (cm_direnum_t *)malloc(size);
+ memset(enump, 0, size);
+ enump->count = entries;
+ return enump;
+}
+
+long
+cm_BPlusDirEnumerate(cm_scache_t *scp, afs_uint32 locked,
+ clientchar_t * maskp, cm_direnum_t **enumpp)
+{
+ afs_uint32 count = 0, slot, numentries;
+ Nptr leafNode = NONODE, nextLeafNode;
+ Nptr firstDataNode, dataNode, nextDataNode;
+ cm_direnum_t * enump = NULL;
+ long rc = 0;
+ char buffer[512];
+
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumerate start");
+
+ /* Read lock the bplus tree so the data can't change */
+ if (!locked)
+ lock_ObtainRead(&scp->dirlock);
+
+ if (scp->dirBplus == NULL) {
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumerate No BPlus Tree");
+ rc = CM_ERROR_WOULDBLOCK;
+ goto done;
+ }
+
+ /* Compute the number of entries */
+ for (count = 0, leafNode = getleaf(scp->dirBplus); leafNode; leafNode = nextLeafNode) {
+
+ for ( slot = 1, numentries = numentries(leafNode); slot <= numentries; slot++) {
+ firstDataNode = getnode(leafNode, slot);
+
+ for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) {
+
+ /* There can be two data nodes for one file. One for
+ the long name and one for the short name. We only
+ include one of these for the enumeration */
+
+ if (maskp == NULL) {
+ if (!getdatavalue(dataNode).shortform)
+ count++;
+ } else {
+ if (!getdatavalue(dataNode).shortform &&
+ cm_MatchMask(getdatavalue(dataNode).cname, maskp, CM_FLAG_CASEFOLD))
+ count++;
+ }
+ nextDataNode = getdatanext(dataNode);
+ }
+ }
+
+ nextLeafNode = getnextnode(leafNode);
+ }
+
+ StringCbPrintfA(buffer, sizeof(buffer), "BPlusTreeEnumerate count = %d", count);
+ osi_Log1(afsd_logp, "BPlus: %s", osi_LogSaveString(afsd_logp, buffer));
+
+ /* Allocate the enumeration object */
+ enump = cm_BPlusEnumAlloc(count);
+ if (enump == NULL) {
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumerate Alloc failed");
+ rc = ENOMEM;
+ goto done;
+ }
+
+ /* Copy the name and fid for each cname entry into the enumeration */
+ for (count = 0, leafNode = getleaf(scp->dirBplus); leafNode; leafNode = nextLeafNode) {
+
+ for ( slot = 1, numentries = numentries(leafNode); slot <= numentries; slot++) {
+ firstDataNode = getnode(leafNode, slot);
+
+ for ( dataNode = firstDataNode; dataNode; dataNode = nextDataNode) {
+ clientchar_t * name;
+ int includeIt = 0;
+
+ if (maskp == NULL) {
+ if (!getdatavalue(dataNode).shortform) {
+ includeIt = 1;
+ }
+ } else {
+ if (!getdatavalue(dataNode).shortform &&
+ cm_MatchMask(getdatavalue(dataNode).cname, maskp, CM_FLAG_CASEFOLD)) {
+ includeIt = 1;
+ }
+ }
+
+ if (includeIt) {
+ name = cm_ClientStrDup(getdatavalue(dataNode).cname);
+
+ if (name == NULL) {
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumerate strdup failed");
+ rc = ENOMEM;
+ goto done;
+ }
+
+ enump->entry[count].name = name;
+ enump->entry[count].fid = getdatavalue(dataNode).fid;
+
+ if (!cm_Is8Dot3(name)) {
+ cm_dirFid_t dfid;
+
+ dfid.vnode = htonl(getdatavalue(dataNode).fid.vnode);
+ dfid.unique = htonl(getdatavalue(dataNode).fid.unique);
+
+ cm_Gen8Dot3NameIntW(name, &dfid, enump->entry[count].shortName, NULL);
+ } else {
+ StringCbCopyW(enump->entry[count].shortName,
+ sizeof(enump->entry[count].shortName),
+ name);
+ }
+
+ count++;
+ }
+ nextDataNode = getdatanext(dataNode);
+ }
+ }
+
+ nextLeafNode = getnextnode(leafNode);
+ }
+
+ done:
+ if (!locked)
+ lock_ReleaseRead(&scp->dirlock);
+
+ /* if we failed, cleanup any mess */
+ if (rc != 0) {
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumerate rc != 0");
+ if (enump) {
+ for ( count = 0; count < enump->count && enump->entry[count].name; count++ ) {
+ free(enump->entry[count].name);
+ }
+ free(enump);
+ enump = NULL;
+ }
+ }
+
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumerate end");
+ *enumpp = enump;
+ return rc;
+}
+
+long
+cm_BPlusDirEnumBulkStat(cm_scache_t *dscp, cm_direnum_t *enump, cm_user_t *userp, cm_req_t *reqp)
+{
+ cm_bulkStat_t *bsp;
+ afs_uint32 count;
+ afs_uint32 code;
+
+ if ( dscp->fid.cell == AFS_FAKE_ROOT_CELL_ID )
+ return 0;
+
+ bsp = malloc(sizeof(cm_bulkStat_t));
+ memset(bsp, 0, sizeof(cm_bulkStat_t));
+
+ for ( count = 0; count < enump->count; count++ ) {
+ cm_scache_t *tscp = cm_FindSCache(&enump->entry[count].fid);
+ int i;
+
+ if (tscp) {
+ if (lock_TryWrite(&tscp->rw)) {
+ /* we have an entry that we can look at */
+ if (!(tscp->flags & CM_SCACHEFLAG_EACCESS) && cm_HaveCallback(tscp)) {
+ /* we have a callback on it. Don't bother
+ * fetching this stat entry, since we're happy
+ * with the info we have.
+ */
+ lock_ReleaseWrite(&tscp->rw);
+ cm_ReleaseSCache(tscp);
+ continue;
+ }
+ lock_ReleaseWrite(&tscp->rw);
+ } /* got lock */
+ cm_ReleaseSCache(tscp);
+ } /* found entry */
+
+ i = bsp->counter++;
+ bsp->fids[i].Volume = enump->entry[count].fid.volume;
+ bsp->fids[i].Vnode = enump->entry[count].fid.vnode;
+ bsp->fids[i].Unique = enump->entry[count].fid.unique;
+
+ if (bsp->counter == AFSCBMAX) {
+ code = cm_TryBulkStatRPC(dscp, bsp, userp, reqp);
+ memset(bsp, 0, sizeof(cm_bulkStat_t));
+ }
+ }
+
+ if (bsp->counter > 0)
+ code = cm_TryBulkStatRPC(dscp, bsp, userp, reqp);
+
+ free(bsp);
+ return 0;
+}
+
+long
+cm_BPlusDirNextEnumEntry(cm_direnum_t *enump, cm_direnum_entry_t **entrypp)
+{
+ if (enump == NULL || entrypp == NULL || enump->next >= enump->count) {
+ if (entrypp)
+ *entrypp = NULL;
+ osi_Log0(afsd_logp, "cm_BPlusDirNextEnumEntry invalid input");
+ return CM_ERROR_INVAL;
+ }
+
+ *entrypp = &enump->entry[enump->next++];
+ if ( enump->next == enump->count ) {
+ osi_Log0(afsd_logp, "cm_BPlusDirNextEnumEntry STOPNOW");
+ return CM_ERROR_STOPNOW;
+ }
+ else {
+ osi_Log0(afsd_logp, "cm_BPlusDirNextEnumEntry SUCCESS");
+ return 0;
+ }
+}
+
+long
+cm_BPlusDirFreeEnumeration(cm_direnum_t *enump)
+{
+ afs_uint32 count;
+
+ osi_Log0(afsd_logp, "cm_BPlusDirFreeEnumeration");
+
+ if (enump) {
+ for ( count = 0; count < enump->count && enump->entry[count].name; count++ ) {
+ free(enump->entry[count].name);
+ }
+ free(enump);
+ }
+ return 0;
+}
+
+long
+cm_BPlusDirEnumTest(cm_scache_t * dscp, afs_uint32 locked)
+{
+ cm_direnum_t * enump = NULL;
+ cm_direnum_entry_t * entryp;
+ long code;
+
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumTest start");
+
+ for (code = cm_BPlusDirEnumerate(dscp, locked, NULL, &enump); code == 0; ) {
+ code = cm_BPlusDirNextEnumEntry(enump, &entryp);
+ if (code == 0 || code == CM_ERROR_STOPNOW) {
+ char buffer[1024];
+ cm_scache_t *scp;
+ char * type = "ScpNotFound";
+ afs_uint64 dv = -1;
+
+ scp = cm_FindSCache(&entryp->fid);
+ if (scp) {
+ switch (scp->fileType) {
+ case CM_SCACHETYPE_FILE :
+ type = "File";
+ break;
+ case CM_SCACHETYPE_DIRECTORY :
+ type = "Directory";
+ break;
+ case CM_SCACHETYPE_SYMLINK :
+ type = "Symlink";
+ break;
+ case CM_SCACHETYPE_MOUNTPOINT:
+ type = "MountPoint";
+ break;
+ case CM_SCACHETYPE_DFSLINK :
+ type = "Dfs";
+ break;
+ case CM_SCACHETYPE_INVALID :
+ type = "Invalid";
+ break;
+ default:
+ type = "Unknown";
+ break;
+ }
+
+ dv = scp->dataVersion;
+ cm_ReleaseSCache(scp);
+ }
+
+ StringCbPrintfA(buffer, sizeof(buffer), "'%S' Fid = (%d,%d,%d,%d) Short = '%S' Type %s DV %I64d",
+ entryp->name,
+ entryp->fid.cell, entryp->fid.volume, entryp->fid.vnode, entryp->fid.unique,
+ entryp->shortName,
+ type,
+ dv);
+
+ osi_Log0(afsd_logp, osi_LogSaveString(afsd_logp, buffer));
+ }
+ }
+
+ if (enump)
+ cm_BPlusDirFreeEnumeration(enump);
+
+ osi_Log0(afsd_logp, "cm_BPlusDirEnumTest end");
+
+ return 0;
+}
#endif /* USE_BPLUS */
git://git.openafs.org / openafs.git / blobdiff