head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.4 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.2 pkgsrc-2011Q2-base:1.2 pkgsrc-2010Q4:1.1.0.28 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.26 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.24 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.22 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.20 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.18 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.16 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.14 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.12 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.10 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.8 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.6 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.4 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2011.02.23.10.32.29; author adam; state dead; branches; next 1.1; 1.1 date 2008.04.03.11.18.23; author joerg; state Exp; branches; next ; desc @@ 1.2 log @Changes 2.5.16: * Fixed container creation so that it honors page size in XmlContainerConfig * Fix the base-uri of an attribute node when using WholedocContainer storage * Fixed an assertion failure during query preparation with a recursive user defined function * Fixed an assertion failure when an as-yet unseen URI in used in a query * Fixed a problem where attribute indexes would not properly be updated if there were no element indexes present. This might have a symptom of DB_NOTFOUND errors or duplicate index entries for attributes * Changed the algorithm used to create node IDs during partial update to be more efficient and create shorter node IDs in general * Fixed a problem where deleting the XmlResults object returned by XmlValue.getAttributes() might cause an exception when the original XmlResults for the XmlValue object was next accessed * XQuery Update queries will no longer crash when statistics are disabled * Fixed a bug in document level indexing that could result in index entries being deleted inappropriately when a node was deleted * Fixed fn:doc() to raise an error in all cases if the document does not exist * Fixed a bug occurring when fn:subsequence() and "order by" were used in certain configurations * Changed XmlResults.asEventWriter(), now only one active XmlEventWriter is allowed for an XmlResults object @ text @$NetBSD: patch-ad,v 1.1 2008/04/03 11:18:23 joerg Exp $ Replace non-portable function with gettimeofday. --- ../src/dbxml/HighResTimer.cpp.orig 2003-05-09 02:01:45.000000000 +0200 +++ ../src/dbxml/HighResTimer.cpp @@@@ -17,8 +17,6 @@@@ static const char revid[] = "$Id: HighRe #include #include -extern "C" int __os_clock(DB_ENV *, u_int32_t *, u_int32_t *); - using namespace DbXml; #ifdef _MSC_VER @@@@ -96,6 +94,10 @@@@ void HighResTimer::reset() #else /* !_MSC_VER */ +extern "C" { +#include +} + HighResTimer::HighResTimer(const char *name, const char *what, const char *whats) : name_(name), what_(what), @@@@ -110,14 +112,22 @@@@ HighResTimer::~HighResTimer() void HighResTimer::start() { - (void)__os_clock(NULL, &start_secs, &start_usecs); + struct timeval tv; + + gettimeofday(&tv, NULL); + start_secs = tv.tv_sec; + start_usecs = tv.tv_usec; } void HighResTimer::stop() { #define USECS_PER_SEC 1000000 + struct timeval tv; u_int32_t stop_secs, stop_usecs; - (void)__os_clock(NULL, &stop_secs, &stop_usecs); + + gettimeofday(&tv, NULL); + stop_secs = tv.tv_sec; + stop_usecs = tv.tv_usec; duration_secs += (stop_secs - start_secs); duration_usecs += (stop_usecs - start_usecs); // fixup for usec under/overflow @ 1.1 log @No idea what __os_clock is, but replace it with portable gettimeofday usage. Add DESTDIR support. Bump revision. @ text @d1 1 a1 1 $NetBSD$ @