*** empty log message ***

7 files changed, 34 insertions, 12 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index ec04084fdd4..13af443c095 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,9 @@
+Sat Mar 13 16:16:13 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
+
+	* docs/tutorials/021:  Added some comments to page04 about the
+	template parameters and the use of the ACE_LOCK parameter in
+	particular.  (Thanks to Bala for the suggestion.)
+
 Sat Mar 13 13:27:55 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/OS.i (timezone,tzset): not supported on VxWorks.
diff --git a/docs/tutorials/001/page02.html b/docs/tutorials/001/page02.html
index 42180451fc3..560f092dd21 100644
--- a/docs/tutorials/001/page02.html
+++ b/docs/tutorials/001/page02.html
@@ -71,7 +71,7 @@ to "read" data from an established connection.
 <font color=red>// $Id$</font>
 
 <font color=red>/* Include the header file where our client acceptor is defined.  */</font>
-<font color=blue>#include</font> "<font color=green>ace/Reactor.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/Reactor.h">ace/Reactor.h</A>"
 
 <font color=red>/* For simplicity, we create our reactor in the global address space.
   In later tutorials we will do something more clever and
diff --git a/docs/tutorials/001/page03.html b/docs/tutorials/001/page03.html
index 88add75adc8..00a8d4c7646 100644
--- a/docs/tutorials/001/page03.html
+++ b/docs/tutorials/001/page03.html
@@ -44,16 +44,16 @@ appropriate section (event_handler) which would cater to his needs.
 
 <font color=red>/* A SOCK_Acceptor knows how to accept socket connections.  We'll use
   one of those at the heart of our Logging_Acceptor.  */</font>
-<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-# pragma once
+<font color=blue># pragma</font> <font color=purple>once</font>
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* An Event_Handler is what you register with ACE_Reactor.  When
   events occur, the reactor will callback on the Event_Handler.  More
   on that in a few lines.  */</font>
-<font color=blue>#include</font> "<font color=green>ace/Event_Handler.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/Event_Handler.h">ace/Event_Handler.h</A>"
 
 <font color=red>/* When a client connects, we'll create a Logging_Handler to deal with
   the connection.  Here, we bring in that declaration.  */</font>
diff --git a/docs/tutorials/001/page04.html b/docs/tutorials/001/page04.html
index aac12e70ba9..58bc6d5848e 100644
--- a/docs/tutorials/001/page04.html
+++ b/docs/tutorials/001/page04.html
@@ -27,17 +27,17 @@ object.
 <font color=red>/* A connection handler will also be derived from ACE_Event_Handler so
   that we can register with a reactor.  */</font>
 
-<font color=blue>#include</font> "<font color=green>ace/Event_Handler.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/Event_Handler.h">ace/Event_Handler.h</A>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-# pragma once
+<font color=blue># pragma</font> <font color=purple>once</font>
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
 
 <font color=red>/* Since we're doing TCP/IP, we'll need a SOCK_Stream for the
   connection.  */</font>
-<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
 
 class Logging_Handler : public ACE_Event_Handler
 {
diff --git a/docs/tutorials/021/Makefile b/docs/tutorials/021/Makefile
index c369a70c402..eb4a321345f 100644
--- a/docs/tutorials/021/Makefile
+++ b/docs/tutorials/021/Makefile
@@ -64,7 +64,7 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
diff --git a/docs/tutorials/021/mpool.h b/docs/tutorials/021/mpool.h
index 9b785f1fb90..96a238f2ff4 100644
--- a/docs/tutorials/021/mpool.h
+++ b/docs/tutorials/021/mpool.h
@@ -24,7 +24,7 @@ public:
   Allocator (const char * _name = "MemoryPool");
   ~Allocator (void);
 
-  typedef ACE_Malloc<ACE_MMAP_Memory_Pool, ACE_SV_Semaphore_Simple> pool_t;
+  typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SV_Semaphore_Simple> pool_t;
 
   // Provide an accessor to the pool.  This will also allocate the
   // pool when first invoked.
diff --git a/docs/tutorials/021/page04.html b/docs/tutorials/021/page04.html
index a65916da86d..00db7ad203e 100644
--- a/docs/tutorials/021/page04.html
+++ b/docs/tutorials/021/page04.html
@@ -28,7 +28,7 @@
 <font color=blue>#define</font> <font color=purple>MPOOL_H</font>
 
 <font color=red>// Everything else we need is in this one header</font>
-<font color=blue>#include</font> "<font color=green>ace/Malloc.h</font>"
+<font color=blue>#include</font> "<A HREF="../../../ace/Malloc.h">ace/Malloc.h</A>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_SYSV_SHMEM</font>)
 
@@ -47,7 +47,7 @@ public:
   Allocator (const char * _name = "<font color=green>MemoryPool</font>");
   ~Allocator (void);
 
-  typedef ACE_Malloc&lt;ACE_MMAP_Memory_Pool, ACE_SV_Semaphore_Simple> pool_t;
+  typedef ACE_Malloc&lt;ACE_MMAP_MEMORY_POOL, ACE_SV_Semaphore_Simple> pool_t;
 
   <font color=red>// Provide an accessor to the pool.  This will also allocate the</font>
   <font color=red>// pool when first invoked.</font>
@@ -89,5 +89,21 @@ public:
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_SYSV_SHMEM */</font>
 <font color=blue>#endif</font> <font color=red>/* MPOOL_H */</font>
 </PRE>
+<HR>
+    The really hard stuff is done by the ACE_Malloc<> template.  This
+      template takes two parameters.<sup>*</sup>  The first is a
+      memory pool class to use.  ACE has several, I've choosen one
+      that uses a memory-mapped file.  The second parameter is a lock
+      class of some sort.  This is needed so that the ACE_Malloc<> can 
+        protect its internal data.  Note that you still have to
+        provide your own mutex around the data you put into the
+        malloc'd area.
+
+<P>
+          * Actually, some implementations may require a different
+          number of parameters.
+        That's why ACE uses those funky macros.  ACE_MMAP_MEMORY_POOL
+        for instance turns into ACE_MMAP_Memory_Pool on Linux but may
+        do other things on your platform.
 <P><HR WIDTH="100%">
 <CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page05.html">Continue This Tutorial</A>]</CENTER>