c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

xpath: Remove union swap optimization

Browse Source 
This would require locking to make it thread-safe.
This commit is contained in:
Nick Wellnhofer 2024-07-15 20:04:08 +02:00
parent 79e119954c
commit be250b798f
1 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
xpath.c
View File

@ -226,13 +226,6 @@ static const xmlNs xmlXPathXMLNamespaceStruct = {
NULL NULL
}; };
static const xmlNs *const xmlXPathXMLNamespace = &xmlXPathXMLNamespaceStruct; static const xmlNs *const xmlXPathXMLNamespace = &xmlXPathXMLNamespaceStruct;
#ifndef LIBXML_THREAD_ENABLED
/*
* Optimizer is disabled only when threaded apps are detected while
* the library ain't compiled for thread safety.
*/
static int xmlXPathDisableOptimizer = 0;
#endif
static void static void
xmlXPathNodeSetClear(xmlNodeSetPtr set, int hasNsNodes); xmlXPathNodeSetClear(xmlNodeSetPtr set, int hasNsNodes);
@ -1015,32 +1008,6 @@ xmlXPathCompExprAdd(xmlXPathParserContextPtr ctxt, int ch1, int ch2,
return(comp->nbStep++); return(comp->nbStep++);
} }
/**
* xmlXPathCompSwap:
* @comp: the compiled expression
* @op: operation index
*
* Swaps 2 operations in the compiled expression
*/
static void
xmlXPathCompSwap(xmlXPathStepOpPtr op) {
int tmp;
#ifndef LIBXML_THREAD_ENABLED
/*
* Since this manipulates possibly shared variables, this is
* disabled if one detects that the library is used in a multithreaded
* application
*/
if (xmlXPathDisableOptimizer)
return;
#endif
tmp = op->ch1;
op->ch1 = op->ch2;
op->ch2 = tmp;
}
#define PUSH_FULL_EXPR(op, op1, op2, val, val2, val3, val4, val5) \ #define PUSH_FULL_EXPR(op, op1, op2, val, val2, val3, val4, val5) \
xmlXPathCompExprAdd(ctxt, (op1), (op2), \ xmlXPathCompExprAdd(ctxt, (op1), (op2), \
(op), (val), (val2), (val3), (val4), (val5)) (op), (val), (val2), (val3), (val4), (val5))
@ -11054,9 +11021,6 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt,
} }
valuePush(ctxt, arg1); valuePush(ctxt, arg1);
xmlXPathReleaseObject(ctxt->context, arg2); xmlXPathReleaseObject(ctxt->context, arg2);
/* optimizer */
if (total > cur)
xmlXPathCompSwap(op);
total += cur; total += cur;
break; break;
case XPATH_OP_ROOT: case XPATH_OP_ROOT:
@ -11196,9 +11160,6 @@ xmlXPathCompOpEvalLast(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op,
} }
valuePush(ctxt, arg1); valuePush(ctxt, arg1);
xmlXPathReleaseObject(ctxt->context, arg2); xmlXPathReleaseObject(ctxt->context, arg2);
/* optimizer */
if (total > cur)
xmlXPathCompSwap(op);
total += cur; total += cur;
break; break;
case XPATH_OP_ROOT: case XPATH_OP_ROOT:
@ -12481,9 +12442,6 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
{ {
xmlXPathParserContextPtr pctxt; xmlXPathParserContextPtr pctxt;
xmlXPathObjectPtr resObj = NULL; xmlXPathObjectPtr resObj = NULL;
#ifndef LIBXML_THREAD_ENABLED
static int reentance = 0;
#endif
int res; int res;
if (comp == NULL) if (comp == NULL)
@ -12492,12 +12450,6 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
xmlResetError(&ctxt->lastError); xmlResetError(&ctxt->lastError);
#ifndef LIBXML_THREAD_ENABLED
reentance++;
if (reentance > 1)
xmlXPathDisableOptimizer = 1;
#endif
pctxt = xmlXPathCompParserContext(comp, ctxt); pctxt = xmlXPathCompParserContext(comp, ctxt);
if (pctxt == NULL) if (pctxt == NULL)
return(-1); return(-1);
@ -12517,9 +12469,6 @@ xmlXPathCompiledEvalInternal(xmlXPathCompExprPtr comp,
pctxt->comp = NULL; pctxt->comp = NULL;
xmlXPathFreeParserContext(pctxt); xmlXPathFreeParserContext(pctxt);
#ifndef LIBXML_THREAD_ENABLED
reentance--;
#endif
return(res); return(res);
} }