You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/12/04 23:31:29 UTC

svn commit: r1042254 - in /trafficserver/traffic/trunk/proxy: InkAPITest.cc InkAPITestTool.cc

Author: zwoop
Date: Sat Dec  4 22:31:28 2010
New Revision: 1042254

URL: http://svn.apache.org/viewvc?rev=1042254&view=rev
Log:
TS-456 Fixes for some transform, and other, mismatches of int vs int64 in the new APIs and underlying cache

Modified:
    trafficserver/traffic/trunk/proxy/InkAPITest.cc
    trafficserver/traffic/trunk/proxy/InkAPITestTool.cc

Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1042254&r1=1042253&r2=1042254&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Sat Dec  4 22:31:28 2010
@@ -1605,7 +1605,7 @@ REGRESSION_TEST(SDK_API_TSIOBufferProduc
 
   TSIOBufferProduce(bufp, 10);
 
-  int reader_avail = TSIOBufferReaderAvail(readerp);
+  int64 reader_avail = TSIOBufferReaderAvail(readerp);
   if (reader_avail == 10) {
     SDK_RPRINT(test, "TSIOBufferProduce", "TestCase1", TC_PASS, "ok");
     SDK_RPRINT(test, "TSIOBufferReaderAlloc", "TestCase1", TC_PASS, "ok");
@@ -1642,7 +1642,7 @@ REGRESSION_TEST(SDK_API_TSIOBufferReader
   TSIOBufferProduce(bufp, 10);
   TSIOBufferReaderConsume(readerp, 10);
 
-  int reader_avail = TSIOBufferReaderAvail(readerp);
+  int64 reader_avail = TSIOBufferReaderAvail(readerp);
   if (reader_avail == 0) {
     SDK_RPRINT(test, "TSIOBufferReaderConsume", "TestCase1", TC_PASS, "ok");
     test_passed = true;
@@ -1676,7 +1676,7 @@ REGRESSION_TEST(SDK_API_TSIOBufferReader
 
   TSIOBufferReader readerp2 = TSIOBufferReaderClone(readerp);
 
-  int reader_avail = TSIOBufferReaderAvail(readerp2);
+  int64 reader_avail = TSIOBufferReaderAvail(readerp2);
   if (reader_avail == 5) {
     SDK_RPRINT(test, "TSIOBufferReaderClone", "TestCase1", TC_PASS, "ok");
     test_passed = true;
@@ -2754,7 +2754,7 @@ test_url_print(TSMBuffer bufp, TSMLoc hd
 {
   TSIOBuffer output_buffer;
   TSIOBufferReader reader;
-  int total_avail;
+  int64 total_avail;
 
   TSIOBufferBlock block;
   const char *block_start;
@@ -3990,7 +3990,7 @@ REGRESSION_TEST(SDK_API_TSHttpHdr) (Regr
             } else {
 
               TSIOBufferBlock iobufblock;
-              int bytes_read;
+              int64 bytes_read;
 
               memset(actual_iobuf, 0, (actual_length + 1) * sizeof(char));
               bytes_read = 0;
@@ -5120,7 +5120,7 @@ convert_http_hdr_to_string(TSMBuffer buf
 {
   TSIOBuffer output_buffer;
   TSIOBufferReader reader;
-  int total_avail;
+  int64 total_avail;
 
   TSIOBufferBlock block;
   const char *block_start;
@@ -5378,7 +5378,7 @@ convert_mime_hdr_to_string(TSMBuffer buf
 {
   TSIOBuffer output_buffer;
   TSIOBufferReader reader;
-  int total_avail;
+  int64 total_avail;
 
   TSIOBufferBlock block;
   const char *block_start;
@@ -7194,7 +7194,7 @@ typedef struct
 
 static TSIOBuffer append_buffer;
 static TSIOBufferReader append_buffer_reader;
-static int append_buffer_length;
+static int64 append_buffer_length;
 
 static MyTransformData *
 my_data_alloc()
@@ -7228,8 +7228,8 @@ handle_transform(TSCont contp)
   TSVIO write_vio;
   TransformTestData *contData;
   MyTransformData *data;
-  int towrite;
-  int avail;
+  int64 towrite;
+  int64 avail;
 
   /* Get the output connection where we'll write data to. */
   output_conn = TSTransformOutputVConnGet(contp);
@@ -7248,7 +7248,7 @@ handle_transform(TSCont contp)
   data = contData->transformData;
   if (!data) {
     towrite = TSVIONBytesGet(write_vio);
-    if (towrite != INT_MAX) {
+    if (towrite != INT64_MAX) {
       towrite += append_buffer_length;
     }
     contData->transformData = my_data_alloc();

Modified: trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITestTool.cc?rev=1042254&r1=1042253&r2=1042254&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITestTool.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITestTool.cc Sat Dec  4 22:31:28 2010
@@ -552,7 +552,7 @@ synclient_txn_read_response_handler(TSCo
   ClientTxn *txn = (ClientTxn *) TSContDataGet(contp);
   TSAssert(txn->magic == MAGIC_ALIVE);
 
-  int avail;
+  int64 avail;
 
   switch (event) {
   case TS_EVENT_VCONN_READ_READY:
@@ -646,7 +646,7 @@ synclient_txn_write_request_handler(TSCo
 
     /* Start reading */
     SET_TEST_HANDLER(txn->current_handler, synclient_txn_read_response_handler);
-    txn->read_vio = TSVConnRead(txn->vconn, contp, txn->resp_buffer, INT_MAX);
+    txn->read_vio = TSVConnRead(txn->vconn, contp, txn->resp_buffer, INT64_MAX);
     break;
 
   case TS_EVENT_VCONN_EOS:
@@ -813,7 +813,7 @@ synserver_accept_handler(TSCont contp, T
   txn->write_vio = NULL;
 
   /* start reading */
-  txn->read_vio = TSVConnRead(txn->vconn, txn_cont, txn->req_buffer, INT_MAX);
+  txn->read_vio = TSVConnRead(txn->vconn, txn_cont, txn->req_buffer, INT64_MAX);
 
   return TS_EVENT_IMMEDIATE;
 }
@@ -959,7 +959,8 @@ synserver_txn_read_request_handler(TSCon
   ServerTxn *txn = (ServerTxn *) TSContDataGet(contp);
   TSAssert(txn->magic == MAGIC_ALIVE);
 
-  int avail, end_of_request;
+  int64 avail;
+  int end_of_request;
 
   switch (event) {
   case TS_EVENT_VCONN_READ_READY: