summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-07-22 22:43:18 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-07-22 22:43:18 +0000
commitd61a65ab9816f80fe5053cbcba84c403549f0b30 (patch)
treeaec00aac944e44e35448ecc8b9418d598a7be16e
parent73a3dd732b168a77dc5d9a3ed30151c86a530222 (diff)
downloadATCD-d61a65ab9816f80fe5053cbcba84c403549f0b30.tar.gz
ChangeLogTag: Mon Jul 22 17:26:14 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/tests/Stack_Recursion/Client_Task.cpp7
-rw-r--r--TAO/tests/Stack_Recursion/Sender.cpp8
-rw-r--r--TAO/tests/Stack_Recursion/Sender.h3
-rw-r--r--TAO/tests/Stack_Recursion/Test.idl4
-rw-r--r--TAO/tests/Stack_Recursion/client.cpp4
-rwxr-xr-xTAO/tests/Stack_Recursion/run_test.pl2
7 files changed, 29 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 258f3a468d0..1686df1b820 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jul 22 17:26:14 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tests/Stack_Recursion/Client_Task.cpp:
+ * tests/Stack_Recursion/Sender.cpp:
+ * tests/Stack_Recursion/Sender.h:
+ * tests/Stack_Recursion/Test.idl:
+ * tests/Stack_Recursion/client.cpp:
+ * tests/Stack_Recursion/run_test.pl: Made some cosmetic fixes to
+ get the test to exhibit the crash properly.
+
Mon Jul 22 17:20:41 2002 Jeff Parsons <parsons@cs.wustl.edu>
* TAO_IDL/be/be_structure.cpp:
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index c78761ce880..67a654b08d4 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -61,12 +61,7 @@ Client_Task::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
{
ACE_TRY
{
- Test::Payload_var pl =
- new Test::Payload;
- Test::Payload_out k (pl.out ());
- this->sender_->get_data (1,
- k
- ACE_ENV_ARG_PARAMETER);
+ this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp
index b3cb059bd93..f48b090af9e 100644
--- a/TAO/tests/Stack_Recursion/Sender.cpp
+++ b/TAO/tests/Stack_Recursion/Sender.cpp
@@ -54,3 +54,11 @@ Sender::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
0);
return this->message_count_;
}
+
+
+void
+Sender::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+{
+ return;
+}
diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h
index 4255d956152..56a4ac8d122 100644
--- a/TAO/tests/Stack_Recursion/Sender.h
+++ b/TAO/tests/Stack_Recursion/Sender.h
@@ -39,6 +39,9 @@ public:
virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException));
+
private:
ACE_SYNCH_MUTEX mutex_;
CORBA::ULong message_count_;
diff --git a/TAO/tests/Stack_Recursion/Test.idl b/TAO/tests/Stack_Recursion/Test.idl
index 97af4cb3706..520fe4111bf 100644
--- a/TAO/tests/Stack_Recursion/Test.idl
+++ b/TAO/tests/Stack_Recursion/Test.idl
@@ -7,11 +7,15 @@ module Test
typedef sequence<octet> Payload;
interface Sender {
+
/// Receive a big payload
boolean get_data (in unsigned long size,
out Payload the_payload);
/// Return the number of messages received so far
long get_event_count ();
+
+ /// Simple ping to the server
+ void ping ();
};
};
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index 2670935dd6e..dec14e14636 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -65,10 +65,10 @@ main (int argc, char *argv[])
Client_Task client_task (sender.in (),
1000,
- 3931260,
+ 1048576,
ACE_Thread_Manager::instance ());
- if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 16, 1) == -1)
+ if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 8, 1) == -1)
{
ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
}
diff --git a/TAO/tests/Stack_Recursion/run_test.pl b/TAO/tests/Stack_Recursion/run_test.pl
index 7a853641f2f..6fd3f60728a 100755
--- a/TAO/tests/Stack_Recursion/run_test.pl
+++ b/TAO/tests/Stack_Recursion/run_test.pl
@@ -27,7 +27,7 @@ if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
$CL->Spawn (60);
-$client = $CL->WaitKill (60);
+$client = $CL->WaitKill (120);
if ($client != 0) {
print STDERR "ERROR: client returned $client1\n";