summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-13 18:20:06 +0000
committerjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-13 18:20:06 +0000
commit41676bce89a1453ca8ca659eb91e9507391daa13 (patch)
tree7eaa1470f178c745e3676c7b0c05e26de72b6875 /apps
parent4f8086c59bc923f5f169f05af86f9e871bdc8c90 (diff)
downloadATCD-41676bce89a1453ca8ca659eb91e9507391daa13.tar.gz
Changes to account for Asynch status codes.
Diffstat (limited to 'apps')
-rw-r--r--apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp1
-rw-r--r--apps/JAWS/PROTOTYPE/HTTP_10_Read.cpp1
-rw-r--r--apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp17
-rw-r--r--apps/JAWS/PROTOTYPE/main.cpp1
4 files changed, 19 insertions, 1 deletions
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp
index c6aa3c91781..22d3b959083 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp
@@ -65,6 +65,7 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
// Behaved synchronously, reiterate
continue;
case JAWS_IO_Handler::READ_ERROR:
+ case JAWS_IO_Handler::READ_ERROR_A:
return -1;
default:
// This needs to be a value that tells the framework that
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Read.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Read.cpp
index fe746512d14..868147a1d56 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_10_Read.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTP_10_Read.cpp
@@ -51,6 +51,7 @@ JAWS_HTTP_10_Read_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
}
break;
case JAWS_IO_Handler::READ_ERROR:
+ case JAWS_IO_Handler::READ_ERROR_A:
{
JAWS_TRACE ("JAWS_HTTP_10_Read_Task::handle_put, READ_ERROR");
return -1;
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp
index 31bb5e12e6b..a0f67b2ced3 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "ace/streams.h"
+#include "ace/OS.h"
#include "JAWS/JAWS.h"
#include "JAWS/IO.h"
@@ -39,6 +39,7 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
if (info->status () == (int) JAWS_HTTP_10_Request::STATUS_QUIT)
{
+ data->payload (0);
delete info;
return -1;
}
@@ -71,14 +72,18 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
case JAWS_IO_Handler::WRITE_OK:
if (info->status () == (int) JAWS_HTTP_10_Request::STATUS_QUIT)
{
+ data->payload (0);
delete info;
return -1;
}
+ data->payload (0);
delete info;
return 0;
case JAWS_IO_Handler::WRITE_ERROR:
+ case JAWS_IO_Handler::WRITE_ERROR_A:
+ data->payload (0);
delete info;
return -1;
@@ -100,20 +105,28 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
switch (handler->status ())
{
case JAWS_IO_Handler::TRANSMIT_OK:
+ case JAWS_IO_Handler::TRANSMIT_OK_A:
{
JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, OK");
+ data->payload (0);
+cerr << "(" << thr_self () << ") O deleting info: " << info << "<<<-------" << endl;
delete info;
return 0;
}
case JAWS_IO_Handler::TRANSMIT_ERROR:
+ case JAWS_IO_Handler::TRANSMIT_ERROR_A:
{
JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, ERROR");
+ data->payload (0);
+cerr << "(" << thr_self () << ") E deleting info: " << info << "<<<-------" << endl;
delete info;
return -1;
}
default:
{
JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, DEFAULT");
+ data->payload (0);
+cerr << "<" << thr_self () << "> D deleting info: " << info << "<<<-------" << endl;
delete info;
return 1;
}
@@ -121,6 +134,8 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
}
+cerr << "<" << thr_self () << "> U deleting info: " << info << "<<<-------" << endl;
+ data->payload (0);
delete info;
return -1;
}
diff --git a/apps/JAWS/PROTOTYPE/main.cpp b/apps/JAWS/PROTOTYPE/main.cpp
index 2de9d1f711e..dff69fd9d22 100644
--- a/apps/JAWS/PROTOTYPE/main.cpp
+++ b/apps/JAWS/PROTOTYPE/main.cpp
@@ -37,6 +37,7 @@ main (int argc, char *argv[])
HTTP_Read.next (&HTTP_Parse);
HTTP_Parse.next (&HTTP_Write);
+ HTTP_Write.next (JAWS_Pipeline_Done_Task_Singleton::instance ());
if (server.open (&HTTP_Read) == -1)
ACE_DEBUG ((LM_DEBUG, "JAWS: Error openning server\n"));