From 113b974bb762efb6dd21e5e40349360d5a093fcd Mon Sep 17 00:00:00 2001 From: Aleksey Gurtovoy Date: Sun, 28 Nov 2004 04:44:21 +0000 Subject: [PATCH] merge RC_1_32_0 fixes [SVN r26333] --- doc/concepts.xml | 52 ++++++++++++++++++++++++------------------------ doc/index.html | 8 ++++++++ src/xtime.cpp | 2 +- 3 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 doc/index.html diff --git a/doc/concepts.xml b/doc/concepts.xml index b1586ec9..c507847f 100644 --- a/doc/concepts.xml +++ b/doc/concepts.xml @@ -195,7 +195,7 @@ and constructed for the Mutex object. A Mutex is - + NonCopyable. For a Mutex type M and an object m of that type, @@ -1180,7 +1180,7 @@ the specified time, if any). A read-lock will be granted to all pending readers before any other thread can acquire a write-lock. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1188,7 +1188,7 @@ write-lock Grant the write-lock immediately, if and only if there are no pending read-lock requests. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1200,7 +1200,7 @@ for read-locks exist. If other write-lock requests exist, the lock is granted in accordance with the intra-class scheduling policy. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1212,18 +1212,18 @@ for read-locks exist. If other write-lock requests exist, the lock is granted in accordance with the intra-class scheduling policy. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. read-locked promote -

TODO

 + TODO write-locked demote -

TODO

 + TODO @@ -1261,7 +1261,7 @@ Grant the additional read-lock immediately, IF no outstanding requests for a write-lock exist; otherwise TODO. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1272,7 +1272,7 @@ releases its lock. The read lock will be granted once no other outstanding write-lock requests exist. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1289,7 +1289,7 @@ is granted in accordance with the intra-class scheduling policy. This request will be granted before any new read-lock requests are granted. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1301,18 +1301,18 @@ granted in accordance with the intra-class scheduling policy. This request will be granted before any new read-lock requests are granted. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. read-locked promote -

TODO

 + TODO write-locked demote -

TODO

 + TODO @@ -1355,7 +1355,7 @@ write-locks is granted and released. If other read-lock requests exist, all read-locks will be granted as a group. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1366,7 +1366,7 @@ outstanding write-lock requests exist, they will have to wait until all current read-lock requests are serviced. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1385,7 +1385,7 @@ lock will be granted to one of them in accordance with the intra-class scheduling policy. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1399,18 +1399,18 @@ released. If other write-lock requests exist, this lock will be granted in accordance with the intra-class scheduling policy. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. read-locked promote -

TODO

 + TODO write-locked demote -

TODO

 + TODO @@ -1451,7 +1451,7 @@ write-lock requests exist, this lock will not be granted until at least one of the write-locks is granted and released. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1464,7 +1464,7 @@ exist, exactly one read-lock request will be granted before the next write-lock is granted. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. @@ -1485,7 +1485,7 @@ in accordance with the intra-class scheduling policy. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. write-locked @@ -1498,18 +1498,18 @@ released. If other write-lock requests exist, this lock will be granted in accordance with the intra-class scheduling policy. -

TODO: try-lock, timed-lock.

+ TODO: try-lock, timed-lock. read-locked promote -

TODO

 + TODO write-locked demote -

TODO

 + TODO @@ -1553,7 +1553,7 @@ requirements and constructed for the ReadWriteMutex object. A ReadWriteMutex is - NonCopyable. + NonCopyable. For a ReadWriteMutex type M, diff --git a/doc/index.html b/doc/index.html new file mode 100644 index 00000000..40d3f89e --- /dev/null +++ b/doc/index.html @@ -0,0 +1,8 @@ + + + + + +Automatic redirection failed, please go to ../../../doc/html/threads.html + + diff --git a/src/xtime.cpp b/src/xtime.cpp index ddcc40bc..c559d196 100644 --- a/src/xtime.cpp +++ b/src/xtime.cpp @@ -95,7 +95,7 @@ int xtime_get(struct xtime* xtp, int clock_type) # endif static const boost::uint64_t TIMESPEC_TO_FILETIME_OFFSET = UINT64_C(116444736000000000); - + const boost::uint64_t ft64 = (static_cast(ft.dwHighDateTime) << 32) + ft.dwLowDateTime;