summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-08-30 18:32:51 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-08-30 18:32:51 +0000
commitb0beca83e26aa3afc034114da8635ee0a529ceed (patch)
tree1e8cb94ba6c1c2b8efb57d97076e28d6472c2dd3
parent87cf4d64129128b0189d47c4f010a3cd132a2b6a (diff)
downloadATCD-b0beca83e26aa3afc034114da8635ee0a529ceed.tar.gz
ChangeLogTag:Mon Aug 30 12:53:48 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ChangeLog-99b4
-rw-r--r--THANKS1
-rw-r--r--ace/Local_Tokens.h50
3 files changed, 32 insertions, 23 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 3b4e88bc367..9542efa0350 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,5 +1,9 @@
Mon Aug 30 12:53:48 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+ * ace/Local_Tokens.h: Added a comment explaining that these locking
+ classes aren't intended as general-purpose synchronization
+ mechanisms. Thanks to Brian Wright <bwright@paladyne.com>
+
* examples/Misc/test_trace.cpp (main): Added a call to
ACE_OS::atexit() to make sure we test this someplace.
diff --git a/THANKS b/THANKS
index d4c9b11ee32..d737ca3d485 100644
--- a/THANKS
+++ b/THANKS
@@ -736,6 +736,7 @@ Cliff_H_Campbell <Cliff_H_Campbell@res.raytheon.com>
Narendra Ravi <naren@cs.ualberta.ca>
Krishnakumar B. <kitty@neo.shinko.co.jp>
David Sunwall <das@planet8.tds-eagan.lmco.com>
+Brian Wright <bwright@paladyne.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson. Paul devised the recursive Makefile scheme that
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 1e777ddafdc..7bd42be3443 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -10,29 +10,37 @@
// Local_Tokens.h
//
// = AUTHOR
-// Karl-Heinz Dorn (kdorn@erlh.siemens.de)
-// Douglas C. Schmidt (schmidt@cs.wustl.edu)
-// Tim Harrison (harrison@cs.wustl.edu)
+// Karl-Heinz Dorn <kdorn@erlh.siemens.de>,
+// Douglas C. Schmidt <schmidt@cs.wustl.edu>, and
+// Tim Harrison <harrison@cs.wustl.edu>
//
// = DESCRIPTION
// This file contains definitions for the following classes:
//
-// public:
-// 7. ACE_Token_Proxy
-// 8. ACE_Null_Token : public ACE_Token_Proxy
-// 9. ACE_Local_Mutex : public ACE_Token_Proxy
-// *. ACE_Local_RLock : public ACE_Local_Mutex
-// &. ACE_Local_WLock : public ACE_Local_Mutex
-// private:
-// 1. ACE_TOKEN_CONST
-// 3. ACE_TPQ_Entry
-// b. ACE_TSS_TPQ_Entry
-// c. ACE_TPQ_Iterator
-// 4. ACE_Token_Proxy_Queue
-// 5. ACE_Tokens
-// 6. ACE_Mutex_Token : public ACE_Tokens
-// 12. ACE_RW_Token : public ACE_Tokens
-// a. ACE_Token_Name
+// public:
+// 7. ACE_Token_Proxy
+// 8. ACE_Null_Token : public ACE_Token_Proxy
+// 9. ACE_Local_Mutex : public ACE_Token_Proxy
+// *. ACE_Local_RLock : public ACE_Local_Mutex
+// &. ACE_Local_WLock : public ACE_Local_Mutex
+// private:
+// 1. ACE_TOKEN_CONST
+// 3. ACE_TPQ_Entry
+// b. ACE_TSS_TPQ_Entry
+// c. ACE_TPQ_Iterator
+// 4. ACE_Token_Proxy_Queue
+// 5. ACE_Tokens
+// 6. ACE_Mutex_Token : public ACE_Tokens
+// 12. ACE_RW_Token : public ACE_Tokens
+// a. ACE_Token_Name
+//
+// Note that the locking classes defined in this file are *not*
+// intended to be used as general-purpose synchronization
+// mechanisms, such as mutexes or semaphores. Instead, you should
+// use the <ACE_Recursive_Thread_Mutex>, <ACE_Thread_Mutex>,
+// <ACE_Thread_Semaphore>, etc., that are defined in
+// $ACE_ROOT/ace/Synch.h and $ACE_ROOT/ace/Synch_T.h or the
+// <ACE_Token> that's defined in $ACE_ROOT/ace/Token.h.
//
// ============================================================================
@@ -162,8 +170,6 @@ private:
// Sleep hook.
};
-// ************************************************************
-
// b..
#if defined (ACE_NO_TSS_TOKENS)
typedef ACE_TPQ_Entry ACE_TPQ_ENTRY;
@@ -216,8 +222,6 @@ private:
// Client_id.
};
-// ************************************************************
-
class ACE_Token_Proxy_Queue;
// c..