Merge lp:~zorba-coders/zorba/feature-uuid into lp:zorba

[Paul J. Lucas]

Replaced UUID with thin layer over native platform implementation.

Replaced UUID with thin layer over native platform implementation.

[lp:~zorba-coders/zorba/feature-uuid]

10978. By Paul J. Lucas on 2012-08-05

Removed unnecessary #include.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Paul J. Lucas (paul-lucas)]

Chris: please look at the CMake stuff I changed.
Rodolfo: please look at the Windows-specific stuff (including the Windows-specific CMake stuff).

[Matthias Brantner (matthias-brantner)]

Doesn't build on 32-bit Ubuntu 11.04 with g++ 4.5.2.

[ 68%] Building CXX object src/CMakeFiles/zorba_simplestore.dir/unit_tests/test_uuid.cpp.o
In file included from /home/mbrantner/zorba/sandbox/src/unit_tests/test_uuid.cpp:20:0:
/home/mbrantner/zorba/sandbox/src/util/uuid.h:35:11: error: ‘uint8_t’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:36:11: error: ‘value_type’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:37:11: error: ‘value_type’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:38:11: error: ‘value_type’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:39:11: error: ‘value_type’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:43:11: error: ‘pointer’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:44:11: error: ‘const_pointer’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:65:3: error: ‘value_type’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:80:3: error: ‘iterator’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:89:3: error: ‘const_iterator’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:98:3: error: ‘iterator’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h:107:3: error: ‘const_iterator’ does not name a type
/home/mbrantner/zorba/sandbox/src/util/uuid.h: In member function ‘zorba::uuid::size_type zorba::uuid::size() const’:
/home/mbrantner/zorba/sandbox/src/util/uuid.h:117:20: error: ‘data’ was not declared in this scope
/home/mbrantner/zorba/sandbox/src/util/uuid.h: In member function ‘void zorba::uuid::swap(zorba::uuid&)’:
/home/mbrantner/zorba/sandbox/src/util/uuid.h:126:29: error: ‘begin’ was not declared in this scope
/home/mbrantner/zorba/sandbox/src/util/uuid.h:126:36: error: ‘end’ was not declared in this scope
/home/mbrantner/zorba/sandbox/src/util/uuid.h:126:44: error: ‘struct zorba::uuid’ has no member named ‘begin’
/home/mbrantner/zorba/sandbox/src/util/uuid.h: In member function ‘zorba::uuid::version zorba::uuid::get_version() const’:
/home/mbrantner/zorba/sandbox/src/util/uuid.h:142:34: error: ‘data’ was not declared in this scope
/home/mbrantner/zorba/sandbox/src/util/uuid.h: In function ‘bool zorba::operator==(const zorba::uuid&, const zorba::uuid&)’:
/home/mbrantner/zorba/sandbox/src/util/uuid.h:166:25: error: ‘const struct zorba::uuid’ has no member named ‘begin’
/home/mbrantner/zorba/sandbox/src/util/uuid.h:166:37: error: ‘const struct zorba::uuid’ has no member named ‘end’
/home/mbrantner/zorba/sandbox/src/util/uuid.h:166:47: error: ‘const struct zorba::uuid’ has no member named ‘begin’
/home/mbrantner/zorba/sandbox/src/util/uuid.h: In function ‘bool zorba::operator<(const zorba::uuid&, const zorba::uuid&)’:
/home/mbrantner/zorba/sandbox/src/util/uuid.h:189:8: error: ‘const struct zorba::uuid’ has no member named ‘begin’
/home/mbrantner/zorba/sandbox/src/util/uuid.h:189:20: error: ‘const struct zorba::uuid’ has no member named ‘end’
/home/mbrantner/zorba/sandbox/src/util/uuid.h:189:30: error: ‘const struct zorba::uuid’ has no member named ‘begin’
/home/mbrantner/zorba/sandbox/src/util/uuid.h:189:...

review: Needs Fixing

[lp:~zorba-coders/zorba/feature-uuid]

10979. By Paul J. Lucas on 2012-08-06

Now using stdint.h

10980. By Paul J. Lucas on 2012-08-06

Merge from trunk.

[Paul J. Lucas (paul-lucas)]

It should be fixed.

[Matthias Brantner (matthias-brantner)]

review: Approve

[lp:~zorba-coders/zorba/feature-uuid]

10981. By Paul J. Lucas on 2012-08-06

More comments.

[Rodolfo Ochoa (rodolfo-ochoa)]

From Windows compiling I'm having:

Error 88 error C2440: '=' : cannot convert from 'u_long (__stdcall *)(u_long)' to 'uint32_t' C:\dev\feature-uuid\src\runtime\random\random_impl.cpp 141 1 zorba_simplestore
Error 89 error C2440: '=' : cannot convert from 'u_long (__stdcall *)(u_long)' to 'uint32_t' C:\dev\feature-uuid\src\runtime\random\random_impl.cpp 141 1 zorba_simplestore
Error 90 error C3861: 'ntohl': identifier not found C:\dev\feature-uuid\src\runtime\random\random_impl.cpp 139 1 zorba_simplestore
Error 178 error C3861: 'ntohl': identifier not found C:\dev\feature-uuid\src\util\uuid.cpp 74 1 zorba_simplestore
Error 179 error C2440: 'initializing' : cannot convert from 'u_long (__stdcall *)(u_long)' to 'const uint32_t' C:\dev\feature-uuid\src\util\uuid.cpp 76 1 zorba_simplestore
Error 180 error C3861: 'ntohs': identifier not found C:\dev\feature-uuid\src\util\uuid.cpp 77 1 zorba_simplestore
Error 181 error C2440: 'initializing' : cannot convert from 'u_short (__stdcall *)(u_short)' to 'const uint16_t' C:\dev\feature-uuid\src\util\uuid.cpp 77 1 zorba_simplestore
Error 182 error C3861: 'ntohs': identifier not found C:\dev\feature-uuid\src\util\uuid.cpp 78 1 zorba_simplestore
Error 183 error C2440: 'initializing' : cannot convert from 'u_short (__stdcall *)(u_short)' to 'const uint16_t' C:\dev\feature-uuid\src\util\uuid.cpp 78 1 zorba_simplestore

review: Needs Fixing

[Paul J. Lucas (paul-lucas)]

Rodolfo: I don't understand why there are errors. I actually test compiled this under Windows using Windows 7 and Visual Studio 2010.

According to <http://msdn.microsoft.com/en-us/library/windows/desktop/ms740075(v=vs.85).aspx>, ntohs is declared in Winsock2.h which I include.

Any ideas?

[lp:~zorba-coders/zorba/feature-uuid]

10982. By Paul J. Lucas on 2012-08-07

Removed uuid.cpp dependency on ntohs() and ntohl().

10983. By Paul J. Lucas on 2012-08-07

Removed all ntohl() -- not really necessary.

[Paul J. Lucas (paul-lucas)]

Actually, I just removed all the problematic code so it should compile on Windows. Please try again.

[lp:~zorba-coders/zorba/feature-uuid]

10984. By Paul J. Lucas on 2012-08-07

get_version() now properly returns "unknown" when unknown.

[Rodolfo Ochoa (rodolfo-ochoa)]

Yep, that works!

review: Approve

[lp:~zorba-coders/zorba/feature-uuid]

10985. By Paul J. Lucas on 2012-08-07

Added comment.

[Chris Hillery (ceejatec)]

My only concern is that for non-Apple, non-Windows platforms, you add -luuid to the link line, but there's no CMake stuff to search for a uuid library or to ensure that such an option will compile/link successfully. Is it a guarantee that it will always be available, at least on Linux?

review: Needs Information

[Paul J. Lucas (paul-lucas)]

> My only concern is that for non-Apple, non-Windows platforms, you add -luuid
> to the link line, but there's no CMake stuff to search for a uuid library or
> to ensure that such an option will compile/link successfully. Is it a
> guarantee that it will always be available, at least on Linux?

Good catch. I don't suppose you could add the relevant CMake stuff to find libuuid?

[lp:~zorba-coders/zorba/feature-uuid]

10986. By Paul J. Lucas on 2012-08-15

Merge from trunk.

[Chris Hillery (ceejatec)]

> Good catch. I don't suppose you could add the relevant CMake stuff to find
> libuuid?

1. Are the things you compile/link against on Windows and Mac guaranteed to exist? (ie, do I only need to find libuuid on Linux platforms)

2. What should happen if I *don't* find it? Can the UUID code be made optional at compile time? Would that mean we need a ZORBA_WITH_UUID or something like that? Or, do we have a hard requirement on libuuid and the build should fail without it?

It does appear that on Ubuntu, at least, libuuid comes from the package "libuuid1", which is part of the "minimal" Task and is depended on by some pretty low-level packages such as util-linux and e2fsprogs. It's not clear to me whether it's at all possible to have a functional Linux/Ubuntu system without libuuid existing. So maybe it's OK to assume it will always be there.

[Paul J. Lucas (paul-lucas)]

> 1. Are the things you compile/link against on Windows and Mac guaranteed to
> exist? (ie, do I only need to find libuuid on Linux platforms)

Yes.

> 2. What should happen if I *don't* find it? Can the UUID code be made optional
> at compile time? Would that mean we need a ZORBA_WITH_UUID or something like
> that? Or, do we have a hard requirement on libuuid and the build should fail
> without it?

I think it has to be the latter, but Matthias might know.

[Matthias Brantner (matthias-brantner)]

> > 1. Are the things you compile/link against on Windows and Mac guaranteed to
> > exist? (ie, do I only need to find libuuid on Linux platforms)
>
> Yes.
>
> > 2. What should happen if I *don't* find it? Can the UUID code be made
> optional
> > at compile time? Would that mean we need a ZORBA_WITH_UUID or something like
> > that? Or, do we have a hard requirement on libuuid and the build should fail
> > without it?
>
> I think it has to be the latter, but Matthias might know.
I think it should be a hard requirement. UUID functionality comes with Windows and Mac. On Linux, the library should always be available. Also, as far as I understood, we already depended on libuuid before.

[Chris Hillery (ceejatec)]

> Also, as far as I understood, we already depended on libuuid before.

As far as I can tell, no, we didn't. But, if we should have a hard requirement, so be it. As I said, it looks like it's pretty much standard on Linux.

[Paul J. Lucas (paul-lucas)]

> As far as I can tell, no, we didn't. But, if we should have a hard
> requirement, so be it. As I said, it looks like it's pretty much standard on
> Linux.

Chris: Can you therefore please add the CMake magic to test for libuuid when not on Mac/Windows? Thanks.

[lp:~zorba-coders/zorba/feature-uuid]

10987. By Chris Hillery on 2012-08-22

Make missing uuid.h on Linux a fatal error; check that -luuid works.

[Chris Hillery (ceejatec)]

Turns out this is less standard than I thought. On my standard Ubuntu installation, I cannot compile this branch without installing the "uuid-dev" Ubuntu package, which is where uuid/uuid.h comes from.

I have added a bit of CMake stuff to check that -luuid works if ZORBA_HAVE_UUID_H is true. I also added a clause to make CMake configuration fail is ZORBA_HAVE_UUID_H is false, and you're not on Apple or Win32.

However, I'm a bit uneasy about adding a new hard requirement like this. At the very least, if we decide that this way of doing things is correct, we need to update the Linux build documentation to list the UUID development headers as a build requirement, and mention the uuid-dev on the Ubuntu build page. I won't have time to do that this week due to NoSQL Now, so Paul, please take a crack at it (assuming we decide that it is going to be a new requirement).

review: Needs Fixing

[lp:~zorba-coders/zorba/feature-uuid]

10988. By Paul J. Lucas on 2012-08-28

Merge from trunk.

10989. By Paul J. Lucas on 2012-08-28

Added mention of libUUID to documentation.

[Paul J. Lucas (paul-lucas)]

I added a mention to the build documentation. Approve now?

[lp:~zorba-coders/zorba/feature-uuid]

10990. By Paul J. Lucas on 2012-08-30

Merge from trunk.

[Chris Hillery (ceejatec)]

I still don't love the additional dependency, but I think it probably makes sense not to roll our own UUID libs, so I'll approve this. I wonder if the RQ machine will have it?...

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-uuid-2012-08-31T01-04-21.504Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job feature-uuid-2012-08-31T01-04-21.504Z is finished. The final status was:

All tests succeeded!

=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt	2012-08-30 13:45:43 +0000
+++ CMakeCompiler.txt	2012-08-30 23:54:18 +0000
@@ -241,3 +241,24 @@
     ENDIF (NOT CMAKE_C_FLAGS MATCHES "-fvisibility")
   ENDIF ( ZORBA_GNUCOMPILER_MAJOR_VERSION GREATER 3 )
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+IF (APPLE)
+  # Needed for CFUUID*() functions in util/uuid.c.
+  SET(CMAKE_SHARED_LINKER_FLAGS "-framework CoreFoundation ${CMAKE_SHARED_LINKER_FLAGS}")
+ELSEIF (WIN32)
+  # Needed for UuidCreateSequential() function in util/uuid.c.
+  SET(requiredlibs ${requiredlibs} "Rpcrt4")
+ELSEIF (ZORBA_HAVE_UUID_H)
+  # Needed for uuid_generate() function in util/uuid.c.
+  SET(CMAKE_SHARED_LINKER_FLAGS "-luuid ${CMAKE_SHARED_LINKER_FLAGS}")
+  # Double-check that we can link against the required library.
+  CHECK_LIBRARY_EXISTS(uuid uuid_generate "" LIBUUID_EXISTS)
+  IF (NOT LIBUUID_EXISTS)
+    MESSAGE (FATAL_ERROR "Could not find libuuid - required on Linux!")
+  ENDIF (NOT LIBUUID_EXISTS)
+ELSE (APPLE)
+  # We're not Apple or Win32, and we didn't find uuid.h - can't compile
+  MESSAGE (FATAL_ERROR "Could not find uuid/uuid.h header, which is "
+    "required on Linux. On Ubuntu, the 'uuid-dev' package is required; "
+    "look for similar packages on other platforms.")
+ENDIF (APPLE)
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-30 13:45:43 +0000
+++ CMakeLists.txt	2012-08-30 23:54:18 +0000
@@ -101,6 +101,7 @@
   CHECK_INCLUDE_FILES ("execinfo.h"                   ZORBA_HAVE_EXECINFO_H)
 ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
 CHECK_INCLUDE_FILE_CXX ("FlexLexer.h"               ZORBA_HAVE_FLEXLEXER_H)
+CHECK_INCLUDE_FILES ("uuid/uuid.h"                  ZORBA_HAVE_UUID_H)
 
 CHECK_FUNCTION_EXISTS (strtof                     ZORBA_HAVE_STRTOF_FUNCTION)
 CHECK_FUNCTION_EXISTS (strtoll                    ZORBA_HAVE_STRTOLL_FUNCTION)
 
=== modified file 'ChangeLog'
--- ChangeLog	2012-08-30 15:14:16 +0000
+++ ChangeLog	2012-08-30 23:54:18 +0000
@@ -16,6 +16,7 @@
   * Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window
     variables)
   * Fixed bug #899366 (enforce the type declaration of a window variable)
+  * Now using native UUID libraries.
   * Fixed bug #1024892 (index declaration references udf declared after the index)
   * Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
   * Fixed bug #1039488 (inserting more than one pair at once in a JSON object)
 
=== modified file 'doc/zorba/build_prerequisites.dox'
--- doc/zorba/build_prerequisites.dox	2012-05-02 10:40:42 +0000
+++ doc/zorba/build_prerequisites.dox	2012-08-30 23:54:18 +0000
@@ -33,6 +33,7 @@
 
 - Libxml2 2.2.16 or later (http://xmlsoft.org/)
 - Iconv 1.12 (used by Libxml2; http://www.gnu.org/software/libiconv/)
+- libUUID (non-Mac, non-Windows only; http://linux.die.net/man/3/libuuid)
 
 \subsection recommended_core_zorba Recommended for Core Zorba
 
 
=== modified file 'doc/zorba/build_ubuntu.dox'
--- doc/zorba/build_ubuntu.dox	2012-08-30 13:45:43 +0000
+++ doc/zorba/build_ubuntu.dox	2012-08-30 23:54:18 +0000
@@ -24,7 +24,7 @@
 \subsection ubuntu_libs Core Zorba Library Dependencies
 Required libraries for core Zorba:
 \code
-sudo apt-get install libxml2-dev
+sudo apt-get install libxml2-dev uuid-dev
 \endcode
 
 Recommended libraries for core Zorba:
 
=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake	2012-08-30 13:45:43 +0000
+++ include/zorba/config.h.cmake	2012-08-30 23:54:18 +0000
@@ -52,6 +52,7 @@
 #cmakedefine ZORBA_HAVE_SYS_TYPES_H
 #cmakedefine ZORBA_HAVE_USTRING_H
 #cmakedefine ZORBA_HAVE_UTYPES_H
+#cmakedefine ZORBA_HAVE_UUID_H
 
 // Platform functions
 #cmakedefine ZORBA_HAVE_CLOCKGETTIME_FUNCTION
 
=== modified file 'src/runtime/random/random_impl.cpp'
--- src/runtime/random/random_impl.cpp	2012-08-30 13:45:43 +0000
+++ src/runtime/random/random_impl.cpp	2012-08-30 23:54:18 +0000
@@ -15,6 +15,8 @@
  */
 #include "stdafx.h"
 
+#include <sstream>
+
 #include "system/globalenv.h"
 
 #include "runtime/random/random.h"
@@ -27,7 +29,7 @@
 #include <zorba/util/time.h>
 #include <limits>
 
-#include "util/uuid/uuid.h"
+#include "util/uuid.h"
 
 namespace zorba {
 
@@ -104,6 +106,7 @@
   store::Item_t    num;
   unsigned int     int_seed;
   long             walltime_millis;
+  uint32_t         time_low;
   zstring ltmp;
 
   RandomIteratorState* state;
@@ -125,11 +128,16 @@
     time::get_current_walltime( lCurrWallTime );
     walltime_millis = time::get_walltime_in_millis( lCurrWallTime );
 
-    uuid_t  u;
-    memset(&u, 0, sizeof(uuid_t));
-    uuid_create(&u);
-
-    walltime_millis += u.time_low;
+    uuid u;
+    uuid::create(&u);
+    //
+    // Note that the time_low field as extracted here is always big-endian even
+    // on a little-endian CPU, but it doesn't really matter since it's only
+    // being used as a fancy random-number generator seed.
+    //
+    time_low =
+      (u.data[0] << 24) | (u.data[1] << 16) | (u.data[2] << 8) | u.data[3];
+    walltime_millis += time_low;
 
     int_seed = walltime_millis % std::numeric_limits<unsigned int>::max();
 
@@ -151,16 +159,16 @@
 UuidIterator::nextImpl(store::Item_t& result, PlanState& planState) const
 {
   store::Item_t item;
-  uuid_t  u;
+  uuid u;
   zstring uuidStr;
+  std::ostringstream oss;
 
   PlanIteratorState* state;
   DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
 
-  memset(&u, 0, sizeof(uuid_t));
-
-  uuid_create(&u);
-  uuidStr = uuidToString(u);
+  uuid::create(&u);
+  oss << u;
+  uuidStr = oss.str();
 
   GENV_ITEMFACTORY->createString(result, uuidStr);
   STACK_PUSH(true, state);
 
=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2012-08-30 13:45:43 +0000
+++ src/store/naive/simple_store.cpp	2012-08-30 23:54:18 +0000
@@ -15,6 +15,8 @@
  */
 #include "stdafx.h"
 
+#include <sstream>
+
 #include "simple_store.h"
 #include "store_defs.h"
 
@@ -30,7 +32,7 @@
 #include "diagnostics/diagnostic.h"
 #include <zorba/diagnostic_list.h>
 
-#include "util/uuid/uuid.h"
+#include "util/uuid.h"
 #include "zorbautils/string_util.h"
 
 #ifdef ZORBA_WITH_JSON
@@ -288,9 +290,11 @@
     return theItemFactory->createAnyURI(result, id);
   }
 
-  uuid_t uuid;
-  uuid_create(&uuid);
-  zstring uuidStr = uuidToURI(uuid);
+  uuid u;
+  uuid::create(&u);
+  std::ostringstream oss;
+  oss << "urn:uuid:" << u;
+  zstring uuidStr = oss.str();
 
   assignReference(xmlNode, uuidStr);
 
 
=== modified file 'src/store/naive/store.cpp'
--- src/store/naive/store.cpp	2012-08-30 13:45:43 +0000
+++ src/store/naive/store.cpp	2012-08-30 23:54:18 +0000
@@ -58,7 +58,6 @@
 #include "tree_id_generator.h"
 
 #include "util/cxx_util.h"
-#include "util/uuid/uuid.h"
 #include "zorbautils/string_util.h"
 
 #ifndef ZORBA_NO_FULL_TEXT
 
=== modified file 'src/unit_tests/CMakeLists.txt'
--- src/unit_tests/CMakeLists.txt	2012-08-30 13:45:43 +0000
+++ src/unit_tests/CMakeLists.txt	2012-08-30 23:54:18 +0000
@@ -20,6 +20,7 @@
   test_json_parser.cpp
   test_string.cpp
   test_uri.cpp
+  test_uuid.cpp
   unit_tests.cpp
   test_uri.cpp
   test_json_parser.cpp
 
=== added file 'src/unit_tests/test_uuid.cpp'
--- src/unit_tests/test_uuid.cpp	1970-01-01 00:00:00 +0000
+++ src/unit_tests/test_uuid.cpp	2012-08-30 23:54:18 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2006-2010 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdafx.h"
+#include <iostream>
+
+#include "util/uuid.h"
+
+using namespace std;
+using namespace zorba;
+
+///////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+
+namespace zorba {
+namespace UnitTests {
+
+int test_uuid( int argc, char *argv[] ) {
+  uuid u;
+  uuid::create( &u );
+  cout << u << endl;
+  return 0;
+}
+
+} // namespace UnitTests
+} // namespace zorba
+
+/* vim:set et sw=2 ts=2: */
 
=== modified file 'src/unit_tests/unit_test_list.h'
--- src/unit_tests/unit_test_list.h	2012-08-30 13:45:43 +0000
+++ src/unit_tests/unit_test_list.h	2012-08-30 23:54:18 +0000
@@ -45,6 +45,7 @@
 #ifndef ZORBA_HAVE_UNIQUE_PTR
   int test_unique_ptr( int, char*[] );
 #endif /* ZORBA_HAVE_UNIQUE_PTR */
+  int test_uuid( int, char*[] );
 #ifndef ZORBA_HAVE_UNORDERED_MAP
   int test_unordered_map( int, char*[] );
 #endif /* ZORBA_HAVE_UNORDERED_MAP */
 
=== modified file 'src/unit_tests/unit_tests.cpp'
--- src/unit_tests/unit_tests.cpp	2012-08-30 13:45:43 +0000
+++ src/unit_tests/unit_tests.cpp	2012-08-30 23:54:18 +0000
@@ -54,6 +54,7 @@
 #ifndef ZORBA_HAVE_UNIQUE_PTR
   libunittests["unique_ptr"] = test_unique_ptr;
 #endif /* ZORBA_HAVE_UNIQUE_PTR */
+  libunittests["uuid"] = test_uuid;
 #ifndef ZORBA_HAVE_UNORDERED_MAP
   libunittests["unordered_map"] = test_unordered_map;
 #endif /* ZORBA_HAVE_UNORDERED_MAP */
 
=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	2012-08-30 13:45:43 +0000
+++ src/util/CMakeLists.txt	2012-08-30 23:54:18 +0000
@@ -29,11 +29,10 @@
   unicode_categories.cpp
   uri_util.cpp
   utf8_util.cpp
+  uuid.cpp
   xml_util.cpp
   fx/fxcharheap.cpp
   string/empty_rep_base.cpp
-  uuid/sysdep.cpp
-  uuid/uuid.cpp
   http_util.h
   http_util.cpp)
 
 
=== removed directory 'src/util/uuid'
=== added file 'src/util/uuid.cpp'
--- src/util/uuid.cpp	1970-01-01 00:00:00 +0000
+++ src/util/uuid.cpp	2012-08-30 23:54:18 +0000
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <zorba/config.h>
+
+#include <cstdio>                       /* for sprintf(3) */
+
+#if defined( __APPLE__ )
+# include <cstring>                     /* for memcpy(3) */
+# include <CoreFoundation/CoreFoundation.h>
+#elif defined( ZORBA_HAVE_UUID_H )
+# include <uuid/uuid.h>
+#elif defined( _WIN32 )
+# include <Rpc.h>
+#else
+# error "Unsupported operating system for generating UUIDs"
+#endif
+
+#include "uuid.h"
+
+using namespace std;
+
+namespace zorba {
+
+///////////////////////////////////////////////////////////////////////////////
+
+void uuid::create( uuid *result ) {
+#if defined( __APPLE__ )
+  CFUUIDRef uuid_ref = CFUUIDCreate( NULL );
+  CFUUIDBytes uuid_bytes = CFUUIDGetUUIDBytes( uuid_ref );
+  CFRelease( uuid_ref );
+  ::memcpy( result->data, &uuid_bytes, sizeof result->data );
+#elif defined( ZORBA_HAVE_UUID_H )
+  uuid_generate( result->data );
+#elif defined( _WIN32 )
+  UuidCreateSequential( (UUID*)result->data );
+#endif /* _WIN32 */
+}
+
+uuid::variant uuid::get_variant() const {
+  value_type const octet8 = data[8];
+  if ( (octet8 & 0x80u) == 0x00u )
+    return ncs;
+  if ( (octet8 & 0xC0u) == 0x80u )
+    return rfc4122;
+  if ( (octet8 & 0xE0u) == 0xC0u )
+    return microsoft;
+  return future;
+}
+
+uuid::version uuid::get_version() const {
+  value_type const temp = data[6] & 0xF0u;
+  switch ( temp ) {
+    case time_based:
+    case dce_security:
+    case name_based_md5:
+    case random_number_based:
+    case name_based_sha1:
+      return static_cast<version>( temp );
+    default:
+      return unknown;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+ostream& operator<<( ostream &os, uuid const &u ) {
+  char buf[37];
+  sprintf(                              // verbose & tedious, but fast
+    buf,
+    "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+    u.data[ 0], u.data[ 1], u.data[ 2], u.data[ 3],
+    u.data[ 4], u.data[ 5], u.data[ 6], u.data[ 7],
+    u.data[ 8], u.data[ 9], u.data[10], u.data[11],
+    u.data[12], u.data[13], u.data[14], u.data[15]
+  );
+  return os << buf;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace zorba
+
+/*
+ * Local variables:
+ * mode: c++
+ * End:
+ */
+/* vim:set et sw=2 ts=2: */
 
=== added file 'src/util/uuid.h'
--- src/util/uuid.h	1970-01-01 00:00:00 +0000
+++ src/util/uuid.h	2012-08-30 23:54:18 +0000
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#ifndef ZORBA_UUID_H
+#define ZORBA_UUID_H
+
+#include <algorithm>
+#include <iostream>
+
+#include "zorbamisc/config/stdint.h"
+
+namespace zorba {
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ * A %uuid contains the raw bytes for a UUID.  Note that this is intentially a
+ * \c struct with no constructors, no destructor, and no user-defined
+ * assignment operators so that it remains a POD.
+ *
+ * See also:
+ *  - RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace.
+ *  - http://en.wikipedia.org/wiki/Universally_unique_identifier
+ *
+ * The UUID data is stored as an array of 16 8-bit bytes comprising the 128
+ * bits that is a UUID.  The data is intentionally \e not stored as shown in
+ * "Appendix A - Sample Implementation" of RFC 4122 (the \c struct with
+ * individial fields such as \c time_low, \c time_mid, etc.) since C++ does not
+ * guarantee that the \c struct fields will be laid out in memory as shown in
+ * section "4.1.2. Layout and Byte Order" due to possible padding.
+ */
+struct uuid {
+  typedef uint8_t value_type;
+  typedef value_type& reference;
+  typedef value_type const& const_reference;
+  typedef value_type* pointer;
+  typedef value_type const* const_pointer;
+  typedef std::size_t size_type;
+  typedef std::ptrdiff_t difference_type;
+
+  typedef pointer iterator;
+  typedef const_pointer const_iterator;
+
+  enum variant {
+    ncs,                                ///< NCS backward compatibility
+    rfc4122,                            ///< RFC 4122
+    microsoft,                          ///< Microsoft compatibility
+    future                              ///< Reserved for future use
+  };
+
+  enum version {
+    unknown,
+    time_based          = 0x10,
+    dce_security        = 0x20,
+    name_based_md5      = 0x30,
+    random_number_based = 0x40,
+    name_based_sha1     = 0x50
+  };
+
+  /**
+   * The raw UUID data.
+   */
+  value_type data[16];
+
+  /**
+   * Creates a UUID.  The variant and version of the UUID created is
+   * platform-dependent.
+   *
+   * @param result A pointer to the result.
+   */
+  static void create( uuid *result );
+
+  /**
+   * Creates an iterator to the beginning of the data.
+   *
+   * @return Returns said iterator.
+   */
+  iterator begin() {
+    return data;
+  }
+
+  /**
+   * Creates a const_iterator to the beginning of the data.
+   *
+   * @return Returns said iterator.
+   */
+  const_iterator begin() const {
+    return data;
+  }
+
+  /**
+   * Creates an iterator to one past the end of the data.
+   *
+   * @return Returns said iterator.
+   */
+  iterator end() {
+    return data + size();
+  }
+
+  /**
+   * Creates a const_iterator to one past the end of the data.
+   *
+   * @return Returns said iterator.
+   */
+  const_iterator end() const {
+    return data + size();
+  }
+
+  /**
+   * Gets the size of the UUID data.
+   *
+   * @return Always returns 16.
+   */
+  size_type size() const {
+    return sizeof( data );
+  }
+
+  /**
+   * Swaps this UUID's data with that of another.
+   *
+   * @param that The other UUID to swap data with.
+   */
+  void swap( uuid &that ) {
+    std::swap_ranges( begin(), end(), that.begin() );
+  }
+
+  /**
+   * Gets the variant of this UUID.
+   *
+   * @return Returns said variant.
+   */
+  variant get_variant() const;
+
+  /**
+   * Gets the version of this UUID.
+   *
+   * @return Returns said version.
+   */
+  version get_version() const;
+};
+
+////////// Functions //////////////////////////////////////////////////////////
+
+/**
+ * Swaps two UUIDs' data.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ */
+inline void swap( uuid &u1, uuid &u2 ) {
+  u1.swap( u2 );
+}
+
+/**
+ * Compares two UUIDs for equality.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ * @return Returns \c true only if the two UUIDs are equal.
+ */
+inline bool operator==( uuid const &u1, uuid const &u2 ) {
+  return std::equal( u1.begin(), u1.end(), u2.begin() );
+}
+
+/**
+ * Compares two UUIDs for inequality.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ * @return Returns \c true only if the two UUIDs are not equal.
+ */
+inline bool operator!=( uuid const &u1, uuid const &u2 ) {
+  return !(u1 == u2);
+}
+
+/**
+ * Compares two UUIDs for less-than.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ * @return Returns \c true only if the first UUID is less than the second.
+ */
+inline bool operator<( uuid const &u1, uuid const &u2 ) {
+  return std::lexicographical_compare(
+    u1.begin(), u1.end(), u2.begin(), u2.end()
+  );
+}
+
+/**
+ * Compares two UUIDs for less-than-or-equal-to.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ * @return Returns \c true only if the first UUID is less than or equal to the
+ * second.
+ */
+inline bool operator<=( uuid const &u1, uuid const &u2 ) {
+  return !(u2 < u1);
+}
+
+/**
+ * Compares two UUIDs for greater-than.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ * @return Returns \c true only if the first UUID is greater than the second.
+ */
+inline bool operator>( uuid const &u1, uuid const &u2 ) {
+  return u2 < u1;
+}
+
+/**
+ * Compares two UUIDs for greater-than-or-equal-to.
+ *
+ * @param u1 The first UUID.
+ * @param u2 The second UUID.
+ * @return Returns \c true only if the first UUID is greater than or equal to
+ * the second.
+ */
+inline bool operator>=( uuid const &u1, uuid const &u2 ) {
+  return !(u1 < u2);
+}
+
+/**
+ * Emits the given UUID to the given ostream in canonical UUID format.
+ *
+ * @param os The ostream to emit to.
+ * @param u The UUID to emit.
+ * @return Returns \a os.
+ */
+std::ostream& operator<<( std::ostream &os, uuid const &u );
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace zorba
+
+#endif /* ZORBA_UUID_H */
+/*
+ * Local variables:
+ * mode: c++
+ * End:
+ */
+/* vim:set et sw=2 ts=2: */
 
=== removed file 'src/util/uuid/sysdep.cpp'
--- src/util/uuid/sysdep.cpp	2012-08-30 13:45:43 +0000
+++ src/util/uuid/sysdep.cpp	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "stdafx.h"
-
-#include "sysdep.h"
-
-namespace zorba {
-/* system dependent call to get the current system time. Returned as
-   100ns ticks since UUID epoch, but resolution may be less than
-   100ns. */
-#ifdef WIN32
-
-void get_system_time(xs_unsignedLong *uuid_time)
-{
-  ULARGE_INTEGER time;
-
-  /* NT keeps time in FILETIME format which is 100ns ticks since
-  Jan 1, 1601. UUIDs use time in 100ns ticks since Oct 15, 1582.
-  The difference is 17 Days in Oct + 30 (Nov) + 31 (Dec)
-  + 18 years and 5 leap days, meaning P6653D*/
-  GetSystemTimeAsFileTime((FILETIME *)&time);
-  time.QuadPart +=  (xs_unsignedLong) (1000*1000*10)       // seconds
-                  * (xs_unsignedLong) (60 * 60 * 24)       // days
-                  * (xs_unsignedLong) (17+30+31+365*18+5); // 6653 of days
-  *uuid_time = time.QuadPart;
-}
-
-#else
-
-void get_system_time(xs_unsignedLong *uuid_time)
-{
-  struct timeval tp;
-
-  gettimeofday(&tp, (struct timezone *)0);
-
-  /* Offset between UUID formatted times and Unix formatted times.
-  UUID UTC base time is October 15, 1582.
-  Unix base time is January 1, 1970, meaning P141427D*/
-  *uuid_time = ((xs_unsignedLong)tp.tv_sec * 10000000)
-      + ((xs_unsignedLong)tp.tv_usec * 10)
-      + I64(0x01B21DD213814000);
-}
-
-#endif
-}/*namespace zorba*/
-/* vim:set et sw=2 ts=2: */
 
=== removed file 'src/util/uuid/sysdep.h'
--- src/util/uuid/sysdep.h	2012-08-30 13:45:43 +0000
+++ src/util/uuid/sysdep.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ZORBA_UTIL_UUID_SYSDEP_H
-#define ZORBA_UTIL_UUID_SYSDEP_H
-
-#include "zorbatypes/schema_types.h"
-
-#ifdef WIN32
-  #include <windows.h>
-#else
-  #include <sys/types.h>
-  #include <sys/time.h>
-#endif
-
-/* Set the following to a calls to get and release a global lock */
-#define LOCK
-#define UNLOCK
-
-// /* Set this to what your compiler uses for 64-bit data type */
-#ifdef WIN32
-  #define unsigned64_t unsigned __int64
-  #define I64(C) C
-#else
-  #define unsigned64_t unsigned long long
-  #define I64(C) C##LL
-#endif
-
-namespace zorba {
-
-/* set the following to the number of 100ns ticks of the actual
-resolution of your system's clock */
-#define UUIDS_PER_TICK 1024
-
-typedef struct {
-  char nodeID[6];
-} uuid_node_t;
-
-void get_system_time(xs_unsignedLong *uuid_time);
-
-}/*namespace zorba*/
-
-#endif /* ZORBA_UTIL_UUID_SYSDEP_H */
-/* vim:set et sw=2 ts=2: */
 
=== removed file 'src/util/uuid/uuid.cpp'
--- src/util/uuid/uuid.cpp	2012-08-30 13:45:43 +0000
+++ src/util/uuid/uuid.cpp	1970-01-01 00:00:00 +0000
@@ -1,297 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "stdafx.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "util/uuid/sysdep.h"
-#include "util/uuid/uuid.h"
-#include "util/fs_util.h"
-
-namespace zorba {
-
-/* various forward declarations */
-static int read_state(xs_short *clockseq, xs_unsignedLong *timestamp,
-    uuid_node_t *node);
-static void write_state(xs_short clockseq, xs_unsignedLong timestamp,
-    uuid_node_t node);
-static void format_uuid_v1(uuid_t *uuid, xs_short clockseq,
-    xs_unsignedLong timestamp, uuid_node_t node);
-static void get_current_time(xs_unsignedLong *timestamp);
-static xs_short true_random(void);
-
-int uuid_create(uuid_t *uuid)
-{
-  xs_unsignedLong timestamp, last_time;
-  xs_short clockseq;
-  uuid_node_t node;
-  memset(&node, 0, sizeof(uuid_node_t));
-  uuid_node_t last_node;
-  memset(&last_node, 0, sizeof(uuid_node_t));
-  int f;
-
-  //acquire system-wide lock so we're alone
-  LOCK;
-  //get time, node ID, saved state from non-volatile storage
-  get_current_time(&timestamp);
-//   get_ieee_node_identifier(&node);
-  f = read_state(&clockseq, &last_time, &last_node);
-
-  //if no NV state, or if clock went backwards, or node ID
-  //changed (e.g., new network card) change clockseq
-  if (!f || memcmp(&node, &last_node, sizeof node))
-    clockseq = true_random();
-  else if (timestamp < last_time)
-    clockseq++;
-
-  //save the state for next time
-  write_state(clockseq, timestamp, node);
-
-  UNLOCK;
-
-  //stuff fields into the UUID
-  format_uuid_v1(uuid, clockseq, timestamp, node);
-  return 1;
-}
-
-/* format_uuid_v1 -- make a UUID from the timestamp, clockseq,
-                     and node ID */
-void format_uuid_v1(uuid_t* uuid, xs_short clock_seq,
-                    xs_unsignedLong timestamp, uuid_node_t node)
-{
-  //Construct a version 1 uuid with the information we've gathered plus a few constants.
-  uuid->time_low = (xs_unsignedInt)(timestamp & 0xFFFFFFFF);
-  uuid->time_mid = (xs_unsignedShort)((timestamp >> 32) & 0xFFFF);
-  uuid->time_hi_and_version =(xs_unsignedShort)((timestamp >> 48) & 0x0FFF);
-  uuid->time_hi_and_version |= (1 << 12);
-  uuid->clock_seq_low = clock_seq & 0xFF;
-  uuid->clock_seq_hi_and_reserved = (clock_seq & 0x3F00) >> 8;
-  uuid->clock_seq_hi_and_reserved |= 0x80;
-  memcpy(&uuid->node, &node, sizeof uuid->node);
-}
-
-/* data type for UUID generator persistent state */
-typedef struct {
-  xs_unsignedLong ts;   // saved timestamp
-  uuid_node_t     node; // saved node ID
-  xs_short        cs;   // saved clock sequence
-} uuid_state;
-
-static uuid_state st;
-
-zstring get_tmp_state_name()
-{
-  zstring lTmpFileName;
-#ifdef ZORBA_WITH_FILE_ACCESS
-  fs::get_temp_file<zstring>(&lTmpFileName);
-  lTmpFileName = lTmpFileName.substr(0, lTmpFileName.find_last_of(fs::dir_separator) + 1);
-#endif
-  return lTmpFileName += "state";
-}
-
-//read_state -- read UUID generator state from non-volatile store
-int read_state(xs_short *clockseq, xs_unsignedLong *timestamp,
-               uuid_node_t *node)
-{
-  static int inited = 0;
-  FILE *fp = 0;
-
-  //only need to read state once per boot
-  if (!inited) {
-#ifdef WIN32
-    errno_t err = fopen_s( &fp, get_tmp_state_name().c_str(), "rb");
-    if ( err != 0)
-      return 0;
-#else
-    fp = fopen(get_tmp_state_name().c_str(), "rb");
-    if (fp == NULL)
-      return 0;
-#endif
-
-    size_t lReadLength = fread(&st, sizeof st, 1, fp);
-    fclose(fp);
-    if (lReadLength == 0)
-      return 0;
-    inited = 1;
-  }
-  *clockseq = st.cs;
-  *timestamp = st.ts;
-  *node = st.node;
-  return 1;
-}
-
-// write_state -- save UUID generator state back to non-volatile storage
-void write_state(xs_short clockseq, xs_unsignedLong timestamp,
-                 uuid_node_t node)
-{
-  volatile static bool inited = false;
-  static xs_unsignedLong next_save;
-  FILE* fp = 0;
-
-  if (!inited) {
-    next_save = timestamp;
-    inited = 1;
-  }
-
-  //always save state to volatile shared state
-  st.cs = clockseq;
-  st.ts = timestamp;
-  st.node = node;
-  if (timestamp >= next_save) {
-#ifdef WIN32
-    errno_t err = fopen_s( &fp, get_tmp_state_name().c_str(), "wb");
-    if ( err != 0)
-      return ;
-#else
-    fp = fopen(get_tmp_state_name().c_str(), "wb");
-    if (fp == NULL)
-      return ;
-#endif
-    fwrite(&st, sizeof st, 1, fp);
-    fclose(fp);
-    //schedule next save for 10 seconds from now
-    next_save = timestamp + (10 * 10 * 1000 * 1000);
-  }
-}
-
-// get-current_time -- get time as 60-bit 100ns ticks since UUID epoch.
-// Compensate for the fact that real clock resolution is less than 100ns.
-void get_current_time(xs_unsignedLong *timestamp)
-{
-  static int inited = 0;
-  static xs_unsignedLong time_last;
-  static xs_short uuids_this_tick;
-  xs_unsignedLong time_now;
-
-  if (!inited) {
-    get_system_time(&time_now);
-    uuids_this_tick = UUIDS_PER_TICK;
-    inited = 1;
-  }
-
-  for ( ; ; ) {
-    get_system_time(&time_now);
-
-    //if clock reading changed since last UUID generated
-    if (time_last != time_now) {
-      //reset count of uuids gen'd with this clock reading
-      uuids_this_tick = 0;
-      time_last = time_now;
-      break;
-    }
-    if (uuids_this_tick < UUIDS_PER_TICK) {
-      uuids_this_tick++;
-      break;
-    }
-  //going too fast for our clock; spin
-  }
-  // add the count of uuids to low order bits of the clock reading
-  *timestamp = time_now + uuids_this_tick;
-}
-
-// true_random -- this does not generate a crypto-quality random number.
-static xs_short true_random(void)
-{
-  static int inited = 0;
-  xs_unsignedLong time_now;
-
-  if (!inited) {
-    get_system_time(&time_now);
-    time_now = time_now / UUIDS_PER_TICK;
-    srand((unsigned int)
-          (((time_now >> 32) ^ time_now) & 0xffffffff));
-    inited = 1;
-  }
-
-  return rand();
-}
-
-uuid_t NameSpace_DNS = { // 6ba7b810-9dad-11d1-80b4-00c04fd430c8
-  0x6ba7b810,
-  0x9dad,
-  0x11d1,
-  0x80,
-  0xb4,
-  {
-    0x00, (unsigned char)0xc0,
-    0x4f, (unsigned char)0xd4,
-    0x30, (unsigned char)0xc8
-  }
-};
-
-/* uuidToString -- transform a UUID to a string*/
-zstring uuidToString(const uuid_t& u)
-{
-  char lBuffer[174];
-  sprintf(lBuffer, "%8.8x-%4.4x-%4.4x-%2.2x%2.2x-9300a64ac3cd", u.time_low, u.time_mid,
-          u.time_hi_and_version, u.clock_seq_hi_and_reserved,
-          u.clock_seq_low);
-
-  zstring lResult = lBuffer;
-  return lResult;
-}
-
-/* uuidToString -- transform a UUID to a uri*/
-zstring uuidToURI(const uuid_t& u)
-{
-  char lBuffer[200];
-  sprintf(lBuffer, "urn:uuid:%8.8x-%4.4x-%4.4x-%2.2x%2.2x-9300a64ac3cd", u.time_low, u.time_mid,
-          u.time_hi_and_version, u.clock_seq_hi_and_reserved,
-          u.clock_seq_low);
-
-  zstring lResult = lBuffer;
-  return lResult;
-}
-
-/*
-//This appendix lists the name space IDs for some potentially
-//interesting namespaces, as initialized C structures and in the
-//string representation defined above.
-
-// Name string is a URL
-uuid_t NameSpace_URL = { // 6ba7b811-9dad-11d1-80b4-00c04fd430c8
-  0x6ba7b811,
-  0x9dad,
-  0x11d1,
-  0x80,
-  0xb4,
-  {0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}
-};
-
-// Name string is an ISO OID
-uuid_t NameSpace_OID = { // 6ba7b812-9dad-11d1-80b4-00c04fd430c8
-  0x6ba7b812,
-  0x9dad,
-  0x11d1,
-  0x80,
-  0xb4,
-  {0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}
-};
-
-// Name string is an X.500 DN (in DER or a text output format)
-uuid_t NameSpace_X500 = { // 6ba7b814-9dad-11d1-80b4-00c04fd430c8
-  0x6ba7b814,
-  0x9dad,
-  0x11d1,
-  0x80,
-  0xb4,
-  {0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8}
-};
-*/
-}
-/* vim:set et sw=2 ts=2: */
 
=== removed file 'src/util/uuid/uuid.h'
--- src/util/uuid/uuid.h	2012-08-30 13:45:43 +0000
+++ src/util/uuid/uuid.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ZORBA_UTIL_UUID_H
-#define ZORBA_UTIL_UUID_H
-
-#undef uuid_t
-
-namespace zorba {
-
-typedef struct {
-  xs_unsignedInt    time_low;
-  xs_unsignedShort  time_mid;
-  xs_unsignedShort  time_hi_and_version;
-  xs_unsignedByte   clock_seq_hi_and_reserved;
-  xs_unsignedByte   clock_seq_low;
-  xs_byte           node[6];
-} uuid_t;
-
-/* uuid_create -- generate a UUID */
-int uuid_create(uuid_t * uuid);
-
-/* uuidToString -- transform a UUID to a string */
-zstring uuidToString(const uuid_t& uuid);
-
-/* uuidToURI -- transform a UUID to a URI-formatted string */
-zstring uuidToURI(const uuid_t& uuid);
-
-} // namespace zorba
-#endif /* ZORBA_UTIL_UUID_H */
-/* vim:set et sw=2 ts=2: */