diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 15 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 15 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | docs/tutorials/007/client_acceptor.cpp | 4 | ||||
| -rw-r--r-- | docs/tutorials/007/page04.html | 4 | ||||
| -rw-r--r-- | docs/tutorials/007/page07.html | 16 | ||||
| -rw-r--r-- | docs/tutorials/007/page08.html | 6 | ||||
| -rw-r--r-- | docs/tutorials/007/thread_pool.cpp | 6 | ||||
| -rw-r--r-- | docs/tutorials/007/thread_pool.h | 17 |
10 files changed, 54 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog index f2ce1b9a3d7..8237735c208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,18 @@ +Thu Feb 21 16:33:11 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * docs/tutorials/007: Rename Thread_Pool::open() to Thread_Pool::start() and + Thread_Pool::close() to Thread_Pool::stop() and fixed all the + usages. Also removed the unneeded parameter from stop() and + removed the unneeded re-definition of close() (since we are not + shadowing it any more). Thanks to Peter Heitman + <pheitman@cisco.com> for reporting this. + Thu Feb 21 13:12:44 2002 Chris Cleeland <cleeland_c@ociweb.com> * ace/SSL/SSL_Context.* (ACE_SSL_Context): Added new methods to - specify Diffie-Hellman parameters. These parameters are required - when using DSA certificates/keys. The new methods are dh_params, - dh_params_file_name, and dh_params_file_type. + specify Diffie-Hellman parameters. These parameters are + required when using DSA certificates/keys. The new methods are + dh_params, dh_params_file_name, and dh_params_file_type. Thu Feb 21 09:32:56 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f2ce1b9a3d7..8237735c208 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,9 +1,18 @@ +Thu Feb 21 16:33:11 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * docs/tutorials/007: Rename Thread_Pool::open() to Thread_Pool::start() and + Thread_Pool::close() to Thread_Pool::stop() and fixed all the + usages. Also removed the unneeded parameter from stop() and + removed the unneeded re-definition of close() (since we are not + shadowing it any more). Thanks to Peter Heitman + <pheitman@cisco.com> for reporting this. + Thu Feb 21 13:12:44 2002 Chris Cleeland <cleeland_c@ociweb.com> * ace/SSL/SSL_Context.* (ACE_SSL_Context): Added new methods to - specify Diffie-Hellman parameters. These parameters are required - when using DSA certificates/keys. The new methods are dh_params, - dh_params_file_name, and dh_params_file_type. + specify Diffie-Hellman parameters. These parameters are + required when using DSA certificates/keys. The new methods are + dh_params, dh_params_file_name, and dh_params_file_type. Thu Feb 21 09:32:56 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f2ce1b9a3d7..8237735c208 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,9 +1,18 @@ +Thu Feb 21 16:33:11 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * docs/tutorials/007: Rename Thread_Pool::open() to Thread_Pool::start() and + Thread_Pool::close() to Thread_Pool::stop() and fixed all the + usages. Also removed the unneeded parameter from stop() and + removed the unneeded re-definition of close() (since we are not + shadowing it any more). Thanks to Peter Heitman + <pheitman@cisco.com> for reporting this. + Thu Feb 21 13:12:44 2002 Chris Cleeland <cleeland_c@ociweb.com> * ace/SSL/SSL_Context.* (ACE_SSL_Context): Added new methods to - specify Diffie-Hellman parameters. These parameters are required - when using DSA certificates/keys. The new methods are dh_params, - dh_params_file_name, and dh_params_file_type. + specify Diffie-Hellman parameters. These parameters are + required when using DSA certificates/keys. The new methods are + dh_params, dh_params_file_name, and dh_params_file_type. Thu Feb 21 09:32:56 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> @@ -1462,6 +1462,7 @@ Daniel Troesser <troesser_d@ociweb.com> Ivan Pazymenko <pia@octet.spb.ru> Dan Green <dan.c.green@lmco.com> cyrille@softek.fr +Peter Heitman <pheitman@cisco.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/docs/tutorials/007/client_acceptor.cpp b/docs/tutorials/007/client_acceptor.cpp index 079ae8e6d6a..9e7e6f7348f 100644 --- a/docs/tutorials/007/client_acceptor.cpp +++ b/docs/tutorials/007/client_acceptor.cpp @@ -38,7 +38,7 @@ Client_Acceptor::open (const ACE_INET_Addr &addr, int pool_size) { if (this->concurrency() == thread_pool_ && thread_pool_is_private ()) - thread_pool ()->open (pool_size); + thread_pool ()->start (pool_size); return inherited::open (addr, reactor); } @@ -49,7 +49,7 @@ int Client_Acceptor::close (void) { if (this->concurrency() == thread_pool_ && thread_pool_is_private ()) - thread_pool ()->close (); + thread_pool ()->stop (); return inherited::close (); } diff --git a/docs/tutorials/007/page04.html b/docs/tutorials/007/page04.html index 8f5a04a13d9..9e190725942 100644 --- a/docs/tutorials/007/page04.html +++ b/docs/tutorials/007/page04.html @@ -60,7 +60,7 @@ int int pool_size) { if (this->concurrency() == thread_pool_ && thread_pool_is_private ()) - thread_pool ()->open (pool_size); + thread_pool ()->start (pool_size); return <font color=#008888>inherited::open</font> (addr, reactor); } @@ -71,7 +71,7 @@ int <font color=#008888>Client_Acceptor::close</font> (void) { if (this->concurrency() == thread_pool_ && thread_pool_is_private ()) - thread_pool ()->close (); + thread_pool ()->stop (); return <font color=#008888>inherited::close</font> (); } diff --git a/docs/tutorials/007/page07.html b/docs/tutorials/007/page07.html index 52f6ecfac70..ec322f1ee77 100644 --- a/docs/tutorials/007/page07.html +++ b/docs/tutorials/007/page07.html @@ -61,24 +61,14 @@ public: <font color=red>// Basic constructor</font> Thread_Pool (void); - <font color=red>/* Opening the thread pool causes one or more threads to be + <font color=red>/* Starting the thread pool causes one or more threads to be activated. When activated, they all execute the svc() method declared below. */</font> - int open (int pool_size = default_pool_size_); - - <font color=red>/* Some compilers will complain that our open() above attempts to - override a virtual function in the baseclass. We have no - intention of overriding that method but in order to keep the - compiler quiet we have to add this method as a pass-thru to the - baseclass method. */</font> - virtual int open (void *void_data) - { - return <font color=#008888>inherited::open</font> (void_data); - } + int start (int pool_size = default_pool_size_); <font color=red>/* */</font> - virtual int close (u_long flags = 0); + virtual int stop (void); <font color=red>/* To use the thread pool, you have to put some unit of work into it. Since we're dealing with event handlers (or at least their diff --git a/docs/tutorials/007/page08.html b/docs/tutorials/007/page08.html index 09db461fe37..672c3688c98 100644 --- a/docs/tutorials/007/page08.html +++ b/docs/tutorials/007/page08.html @@ -38,12 +38,12 @@ Remember back in <A HREF="../006/page01.html">Tutorial 6</A> when I { } -<font color=red>/* Our open() method is a thin disguise around the ACE_Task<> +<font color=red>/* Our start() method is a thin disguise around the ACE_Task<> activate() method. By hiding activate() in this way, the users of Thread_Pool don't have to worry about the thread configuration flags. */</font> int -<font color=#008888>Thread_Pool::open</font> (int pool_size) +<font color=#008888>Thread_Pool::start</font> (int pool_size) { return this->activate (THR_NEW_LWP|THR_DETACHED, pool_size); } @@ -52,7 +52,7 @@ int take an easy approach and simply enqueue a secret message for each thread we have active. */</font> int -<font color=#008888>Thread_Pool::close</font> (u_long flags) +<font color=#008888>Thread_Pool::stop</font> (void) { ACE_UNUSED_ARG(flags); diff --git a/docs/tutorials/007/thread_pool.cpp b/docs/tutorials/007/thread_pool.cpp index 08302a6811f..1a62ec48c9c 100644 --- a/docs/tutorials/007/thread_pool.cpp +++ b/docs/tutorials/007/thread_pool.cpp @@ -12,12 +12,12 @@ Thread_Pool::Thread_Pool (void) { } -/* Our open() method is a thin disguise around the ACE_Task<> +/* Our start() method is a thin disguise around the ACE_Task<> activate() method. By hiding activate() in this way, the users of Thread_Pool don't have to worry about the thread configuration flags. */ int -Thread_Pool::open (int pool_size) +Thread_Pool::start (int pool_size) { return this->activate (THR_NEW_LWP|THR_DETACHED, pool_size); } @@ -26,7 +26,7 @@ Thread_Pool::open (int pool_size) take an easy approach and simply enqueue a secret message for each thread we have active. */ int -Thread_Pool::close (u_long flags) +Thread_Pool::stop (void) { ACE_UNUSED_ARG(flags); diff --git a/docs/tutorials/007/thread_pool.h b/docs/tutorials/007/thread_pool.h index 9686b5a29da..134f2e89285 100644 --- a/docs/tutorials/007/thread_pool.h +++ b/docs/tutorials/007/thread_pool.h @@ -37,24 +37,15 @@ public: // Basic constructor Thread_Pool (void); - /* Opening the thread pool causes one or more threads to be + /* Starting the thread pool causes one or more threads to be activated. When activated, they all execute the svc() method declared below. */ - int open (int pool_size = default_pool_size_); - - /* Some compilers will complain that our open() above attempts to - override a virtual function in the baseclass. We have no - intention of overriding that method but in order to keep the - compiler quiet we have to add this method as a pass-thru to the - baseclass method. */ - virtual int open (void *void_data) - { - return inherited::open (void_data); - } + int start (int pool_size = default_pool_size_); /* + Shut down the thread pool. */ - virtual int close (u_long flags = 0); + virtual int stop (void); /* To use the thread pool, you have to put some unit of work into it. Since we're dealing with event handlers (or at least their |