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/10/30 00:11:14 UTC
svn commit: r1028930 - in /trafficserver/traffic/trunk:
example/append-transform/ example/cache_plugin/ example/cache_scan/
example/gzip-transform/ example/null-transform/ example/output-header/
example/protocol/ example/redirect-1/ example/server-tran...
Author: zwoop
Date: Fri Oct 29 22:11:12 2010
New Revision: 1028930
URL: http://svn.apache.org/viewvc?rev=1028930&view=rev
Log:
TS-14 Make some InkAPI's 64-bit.
Also unify the APIs to use int32/uint32/int64/uint64.
Reviewed: John Plevyak
Modified:
trafficserver/traffic/trunk/example/append-transform/append-transform.c
trafficserver/traffic/trunk/example/cache_plugin/cache_plugin.cc
trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc
trafficserver/traffic/trunk/example/gzip-transform/gunzip.c
trafficserver/traffic/trunk/example/gzip-transform/gzip.c
trafficserver/traffic/trunk/example/null-transform/null-transform.c
trafficserver/traffic/trunk/example/output-header/output-header.c
trafficserver/traffic/trunk/example/protocol/TxnSM.c
trafficserver/traffic/trunk/example/protocol/TxnSM.h
trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
trafficserver/traffic/trunk/example/server-transform/server-transform.c
trafficserver/traffic/trunk/example/session-1/session-1.c
trafficserver/traffic/trunk/example/thread-pool/psi.c
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/I_Cache.h
trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h
trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
trafficserver/traffic/trunk/iocore/cluster/ClusterVConnection.cc
trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
trafficserver/traffic/trunk/iocore/net/SSLNet.cc
trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
trafficserver/traffic/trunk/proxy/FetchSM.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h
trafficserver/traffic/trunk/proxy/api/ts/experimental.h
trafficserver/traffic/trunk/proxy/api/ts/ts.h
trafficserver/traffic/trunk/proxy/api/ts/ts_private.h
trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h
Modified: trafficserver/traffic/trunk/example/append-transform/append-transform.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/append-transform/append-transform.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/append-transform/append-transform.c (original)
+++ trafficserver/traffic/trunk/example/append-transform/append-transform.c Fri Oct 29 22:11:12 2010
@@ -330,7 +330,7 @@ load(const char *filename)
INKFile fp;
INKIOBufferBlock blk;
char *p;
- int avail;
+ int64 avail;
int err;
fp = INKfopen(filename, "r");
Modified: trafficserver/traffic/trunk/example/cache_plugin/cache_plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/cache_plugin/cache_plugin.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/cache_plugin/cache_plugin.cc (original)
+++ trafficserver/traffic/trunk/example/cache_plugin/cache_plugin.cc Fri Oct 29 22:11:12 2010
@@ -77,7 +77,7 @@ cache_read(INKCont contp, INKEvent event
INKHttpTxn txnp = (INKHttpTxn) edata;
void *key = 0;
int keySize = 0;
- INKU64 size, offset;
+ uint64 size, offset;
// get the key for the lookup
INKCacheKeyGet(txnp, &key, &keySize);
@@ -153,7 +153,7 @@ cache_write(INKCont contp, INKEvent even
// get the buffer to write into cache and get the start of the buffer
INKIOBufferReader buffer = INKCacheBufferReaderGet(txnp);
INKIOBufferBlock block = INKIOBufferReaderStart(buffer);
- int available = INKIOBufferReaderAvail(buffer);
+ int64 available = INKIOBufferReaderAvail(buffer);
string keyString((char *) key, keySize);
@@ -173,7 +173,7 @@ cache_write(INKCont contp, INKEvent even
}
if (available > 0) {
- int ndone = 0;
+ int64 ndone = 0;
do {
const char *data = INKIOBufferBlockReadStart(block, buffer, &available);
Modified: trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc (original)
+++ trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc Fri Oct 29 22:11:12 2010
@@ -50,7 +50,7 @@ struct cache_scan_state_t
INKAction pending_action;
INKCacheKey key_to_delete;
- INK64 total_bytes;
+ int64 total_bytes;
int total_items;
int done;
Modified: trafficserver/traffic/trunk/example/gzip-transform/gunzip.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/gzip-transform/gunzip.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/gzip-transform/gunzip.c (original)
+++ trafficserver/traffic/trunk/example/gzip-transform/gunzip.c Fri Oct 29 22:11:12 2010
@@ -167,7 +167,7 @@ gzip_transform_one(GzipData * data, INKI
INKIOBufferBlock blkp;
const char *ibuf;
char *obuf;
- int ilength, olength;
+ int64 ilength, olength;
int err = Z_OK;
while (amount > 0) {
@@ -236,7 +236,7 @@ gzip_transform_finish(GzipData * data)
if (data->state == 1) {
INKIOBufferBlock blkp;
char *obuf;
- int olength;
+ int64 olength;
int err;
data->state = 2;
Modified: trafficserver/traffic/trunk/example/gzip-transform/gzip.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/gzip-transform/gzip.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/gzip-transform/gzip.c (original)
+++ trafficserver/traffic/trunk/example/gzip-transform/gzip.c Fri Oct 29 22:11:12 2010
@@ -196,7 +196,7 @@ gzip_transform_one(GzipData * data, INKI
INKIOBufferBlock blkp;
const char *ibuf;
char *obuf;
- int ilength, olength;
+ int64 ilength, olength;
int err;
while (amount > 0) {
@@ -248,7 +248,7 @@ gzip_transform_finish(GzipData * data)
if (data->state == 1) {
INKIOBufferBlock blkp;
char *obuf;
- int olength;
+ int64 olength;
int err;
data->state = 2;
Modified: trafficserver/traffic/trunk/example/null-transform/null-transform.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/null-transform/null-transform.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/null-transform/null-transform.c (original)
+++ trafficserver/traffic/trunk/example/null-transform/null-transform.c Fri Oct 29 22:11:12 2010
@@ -74,8 +74,8 @@ handle_transform(INKCont contp)
INKIOBuffer buf_test;
INKVIO input_vio;
MyData *data;
- int towrite;
- int avail;
+ int64 towrite;
+ int64 avail;
INKDebug("null-transform", "Entering handle_transform()");
/* Get the output (downstream) vconnection where we'll write data to. */
@@ -146,14 +146,14 @@ handle_transform(INKCont contp)
* to write to the output connection.
*/
towrite = INKVIONTodoGet(input_vio);
- INKDebug("null-transform", "\ttoWrite is %d", towrite);
+ INKDebug("null-transform", "\ttoWrite is %lld", towrite);
if (towrite > 0) {
/* The amount of data left to read needs to be truncated by
* the amount of data actually in the read buffer.
*/
avail = INKIOBufferReaderAvail(INKVIOReaderGet(input_vio));
- INKDebug("null-transform", "\tavail is %d", avail);
+ INKDebug("null-transform", "\tavail is %lld", avail);
if (towrite > avail) {
towrite = avail;
}
Modified: trafficserver/traffic/trunk/example/output-header/output-header.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/output-header/output-header.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/output-header/output-header.c (original)
+++ trafficserver/traffic/trunk/example/output-header/output-header.c Fri Oct 29 22:11:12 2010
@@ -59,10 +59,10 @@ handle_dns(INKHttpTxn txnp, INKCont cont
INKIOBufferBlock block;
const char *block_start;
- int block_avail;
+ int64 block_avail;
char *output_string;
- int output_len;
+ int64 output_len;
if (!INKHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
INKDebug(DEBUG_TAG, "couldn't retrieve client request header");
Modified: trafficserver/traffic/trunk/example/protocol/TxnSM.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/protocol/TxnSM.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/protocol/TxnSM.c (original)
+++ trafficserver/traffic/trunk/example/protocol/TxnSM.c Fri Oct 29 22:11:12 2010
@@ -259,7 +259,7 @@ int
state_handle_cache_lookup(INKCont contp, INKEvent event, INKVConn vc)
{
TxnSM *txn_sm = (TxnSM *) INKContDataGet(contp);
- int response_size;
+ int64 response_size;
int ret_val;
INKDebug("protocol", "enter state_handle_cache_lookup");
@@ -896,7 +896,7 @@ get_info_from_buffer(INKIOBufferReader t
char *info;
char *info_start;
- int read_avail, read_done;
+ int64 read_avail, read_done;
INKIOBufferBlock blk;
char *buf;
Modified: trafficserver/traffic/trunk/example/protocol/TxnSM.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/protocol/TxnSM.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/protocol/TxnSM.h (original)
+++ trafficserver/traffic/trunk/example/protocol/TxnSM.h Fri Oct 29 22:11:12 2010
@@ -53,7 +53,7 @@ typedef struct _TxnSM
char *q_key;
char *q_server_name;
- INKU32 q_server_ip;
+ uint32 q_server_ip;
int q_server_port;
INKVIO q_client_read_vio;
Modified: trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/redirect-1/redirect-1.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/redirect-1/redirect-1.c (original)
+++ trafficserver/traffic/trunk/example/redirect-1/redirect-1.c Fri Oct 29 22:11:12 2010
@@ -316,7 +316,7 @@ update_redirected_method_stats(INKMBuffe
{
const char *txn_method;
int length;
- INK64 tempint;
+ int64 tempint;
txn_method = INKHttpHdrMethodGet(bufp, hdr_loc, &length);
Modified: trafficserver/traffic/trunk/example/server-transform/server-transform.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/server-transform/server-transform.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/server-transform/server-transform.c (original)
+++ trafficserver/traffic/trunk/example/server-transform/server-transform.c Fri Oct 29 22:11:12 2010
@@ -538,9 +538,9 @@ transform_read_status_event(INKCont cont
INKIOBufferBlock blk;
char *buf;
void *buf_ptr;
- int avail;
- int read_nbytes = sizeof(int);
- int read_ndone = 0;
+ int64 avail;
+ int64 read_nbytes = sizeof(int);
+ int64 read_ndone = 0;
buf_ptr = &data->content_length;
while (read_nbytes > 0) {
Modified: trafficserver/traffic/trunk/example/session-1/session-1.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/session-1/session-1.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/session-1/session-1.c (original)
+++ trafficserver/traffic/trunk/example/session-1/session-1.c Fri Oct 29 22:11:12 2010
@@ -40,7 +40,7 @@ static INKStat av_transaction;
static void
txn_handler(INKHttpTxn txnp, INKCont contp)
{
- INK64 num_txns = 0;
+ int64 num_txns = 0;
INKStatIncrement(transaction_count);
INKStatIntGet(transaction_count, &num_txns);
@@ -52,7 +52,7 @@ txn_handler(INKHttpTxn txnp, INKCont con
static void
handle_session(INKHttpSsn ssnp, INKCont contp)
{
- INK64 num_ssn = 0;
+ int64 num_ssn = 0;
INKStatIncrement(session_count);
INKStatIntGet(session_count, &num_ssn);
Modified: trafficserver/traffic/trunk/example/thread-pool/psi.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/thread-pool/psi.c?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/thread-pool/psi.c (original)
+++ trafficserver/traffic/trunk/example/thread-pool/psi.c Fri Oct 29 22:11:12 2010
@@ -239,7 +239,7 @@ strsearch_ioreader(INKIOBufferReader rea
/* Loop thru each block while we've not yet found the pattern */
while ((block != NULL) && (index < slen)) {
- int blocklen;
+ int64 blocklen;
const char *blockptr = INKIOBufferBlockReadStart(block, reader, &blocklen);
const char *ptr;
@@ -320,7 +320,7 @@ strextract_ioreader(INKIOBufferReader re
/* Now start extraction */
while ((block != NULL) && (p_idx < plen) && (buf_idx < PSI_FILENAME_MAX_SIZE)) {
- int blocklen;
+ int64 blocklen;
const char *blockptr = INKIOBufferBlockReadStart(block, reader, &blocklen);
if (blockptr == INK_ERROR_PTR) {
@@ -547,7 +547,7 @@ psi_include(INKCont contp, void *edata)
while (INKfgets(filep, buf, BUFFER_SIZE) != NULL) {
INKIOBufferBlock block;
- int len, avail, ndone, ntodo, towrite;
+ int64 len, avail, ndone, ntodo, towrite;
char *ptr_block;
len = strlen(buf);
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Fri Oct 29 22:11:12 2010
@@ -341,7 +341,7 @@ bool CacheVC::get_data(int i, void *data
return false;
}
-int
+int64
CacheVC::get_object_size()
{
return ((CacheVC *) this)->doc_len;
Modified: trafficserver/traffic/trunk/iocore/cache/I_Cache.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/I_Cache.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/I_Cache.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/I_Cache.h Fri Oct 29 22:11:12 2010
@@ -183,7 +183,7 @@ struct CacheVConnection:public VConnecti
virtual int get_disk_io_priority() = 0;
virtual bool set_pin_in_cache(time_t t) = 0;
virtual time_t get_pin_in_cache() = 0;
- virtual int get_object_size() = 0;
+ virtual int64 get_object_size() = 0;
CacheVConnection();
};
Modified: trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/NewCacheVC.h Fri Oct 29 22:11:12 2010
@@ -135,7 +135,7 @@ public:
ink_assert(!"implemented");
return -1;
}
- int get_object_size()
+ int64 get_object_size()
{
ink_assert(!"implemented");
return -1;
Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h Fri Oct 29 22:11:12 2010
@@ -352,7 +352,7 @@ struct CacheVC: public CacheVConnection
int evacuateReadHead(int event, Event *e);
void cancel_trigger();
- virtual int get_object_size();
+ virtual int64 get_object_size();
#ifdef HTTP_CACHE
virtual void set_http_info(CacheHTTPInfo *info);
virtual void get_http_info(CacheHTTPInfo ** info);
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterVConnection.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterVConnection.cc Fri Oct 29 22:11:12 2010
@@ -458,7 +458,7 @@ bool ClusterVConnection::get_data(int id
switch (id) {
case CACHE_DATA_SIZE:
{
- *((int *) data) = get_object_size();
+ *((int64 *) data) = get_object_size();
return true;
}
case CACHE_DATA_HTTP_INFO:
@@ -483,7 +483,7 @@ ClusterVConnection::get_http_info(CacheH
*info = &alternate;
}
-int
+int64
ClusterVConnection::get_object_size()
{
return alternate.object_size_get();
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h Fri Oct 29 22:11:12 2010
@@ -581,7 +581,7 @@ struct ClusterVConnection: public Cluste
// in the reply.
virtual bool get_data(int id, void *data); // backward compatibility
virtual void get_http_info(CacheHTTPInfo **);
- virtual int get_object_size();
+ virtual int64 get_object_size();
// For VC(s) established via the HTTP version of OPEN_WRITE, additional
// data for the VC is passed in a second message. This additional
Modified: trafficserver/traffic/trunk/iocore/net/SSLNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLNet.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLNet.cc Fri Oct 29 22:11:12 2010
@@ -46,7 +46,6 @@ int
SSL_CTX_add_extra_chain_cert_file(SSL_CTX * ctx, const char *file)
{
BIO *in;
- int j;
int ret = 0;
X509 *x = NULL;
@@ -61,7 +60,7 @@ SSL_CTX_add_extra_chain_cert_file(SSL_CT
goto end;
}
- j = ERR_R_PEM_LIB;
+ // j = ERR_R_PEM_LIB;
while ((x = PEM_read_bio_X509(in, NULL, ctx->default_passwd_callback, ctx->default_passwd_callback_userdata)) != NULL) {
ret = SSL_CTX_add_extra_chain_cert(ctx, x);
if (!ret) {
Modified: trafficserver/traffic/trunk/libinktomi++/ink_resource.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_resource.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_resource.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_resource.cc Fri Oct 29 22:11:12 2010
@@ -419,7 +419,7 @@ _xmalloc(unsigned int size, const char *
-------------------------------------------------------------------------*/
char *
-_xstrdup(const char *str, int length, const char *path)
+_xstrdup(const char *str, int64 length, const char *path)
{
char *newstr;
Modified: trafficserver/traffic/trunk/proxy/FetchSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/FetchSM.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/FetchSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/FetchSM.cc Fri Oct 29 22:11:12 2010
@@ -76,7 +76,7 @@ FetchSM::get_info_from_buffer(INKIOBuffe
char *info;
// char *info_start;
- int read_avail, read_done;
+ int64 read_avail, read_done;
INKIOBufferBlock blk;
char *buf;
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Fri Oct 29 22:11:12 2010
@@ -1839,19 +1839,20 @@ api_init()
////////////////////////////////////////////////////////////////////
void *
-_INKmalloc(unsigned int size, const char *path)
+_INKmalloc(size_t size, const char *path)
{
return _xmalloc(size, path);
}
void *
-_INKrealloc(void *ptr, unsigned int size, const char *path)
+_INKrealloc(void *ptr, size_t size, const char *path)
{
return _xrealloc(ptr, size, path);
}
+// length has to be int64 and not size_t, since -1 means to call strlen() to get length
char *
-_INKstrdup(const char *str, int length, const char *path)
+_INKstrdup(const char *str, int64 length, const char *path)
{
return _xstrdup(str, length, path);
}
@@ -1880,7 +1881,7 @@ INKdrandom()
return this_ethread()->generator.drandom();
}
-INK64
+ink_hrtime
INKhrtime()
{
return ink_get_based_hrtime();
@@ -2036,15 +2037,15 @@ INKfclose(INKFile filep)
delete file;
}
-int
-INKfread(INKFile filep, void *buf, int length)
+size_t
+INKfread(INKFile filep, void *buf, size_t length)
{
FileImpl *file = (FileImpl *) filep;
return file->fread(buf, length);
}
-int
-INKfwrite(INKFile filep, const void *buf, int length)
+size_t
+INKfwrite(INKFile filep, const void *buf, size_t length)
{
FileImpl *file = (FileImpl *) filep;
return file->fwrite(buf, length);
@@ -2058,7 +2059,7 @@ INKfflush(INKFile filep)
}
char *
-INKfgets(INKFile filep, char *buf, int length)
+INKfgets(INKFile filep, char *buf, size_t length)
{
FileImpl *file = (FileImpl *) filep;
return file->fgets(buf, length);
@@ -4998,7 +4999,7 @@ INKContDataGet(INKCont contp)
}
INKAction
-INKContSchedule(INKCont contp, unsigned int timeout)
+INKContSchedule(INKCont contp, ink_hrtime timeout)
{
if (sdk_sanity_check_iocore_structure(contp) != INK_SUCCESS)
return (INKAction) INK_ERROR_PTR;
@@ -5024,7 +5025,7 @@ INKContSchedule(INKCont contp, unsigned
return action;
}
-INKAction INKHttpSchedule(INKCont contp ,INKHttpTxn txnp, unsigned int timeout)
+INKAction INKHttpSchedule(INKCont contp ,INKHttpTxn txnp, ink_hrtime timeout)
{
if (sdk_sanity_check_iocore_structure (contp) != INK_SUCCESS)
return (INKAction) INK_ERROR_PTR;
@@ -5968,7 +5969,7 @@ INKHttpTxnErrorBodySet(INKHttpTxn txnp,
}
void
-INKHttpTxnServerRequestBodySet(INKHttpTxn txnp, char *buf, int buflength)
+INKHttpTxnServerRequestBodySet(INKHttpTxn txnp, char *buf, int64 buflength)
{
HttpSM *sm = (HttpSM *) txnp;
HttpTransact::State *s = &(sm->t_state);
@@ -6072,9 +6073,9 @@ INKCacheBufferReaderGet(INKCacheTxn txnp
//----------------------------------------------------------------------------
//INKReturnCode
-//INKCacheBufferInfoGet(INKHttpTxn txnp, void **buffer, INKU64 *length, INKU64 *offset)
+//INKCacheBufferInfoGet(INKHttpTxn txnp, void **buffer, uint64 *length, uint64 *offset)
INKReturnCode
-INKCacheBufferInfoGet(INKCacheTxn txnp, INKU64 *length, INKU64 *offset)
+INKCacheBufferInfoGet(INKCacheTxn txnp, uint64 *length, uint64 *offset)
{
NewCacheVC *vc = (NewCacheVC *) txnp;
@@ -6087,7 +6088,7 @@ INKCacheBufferInfoGet(INKCacheTxn txnp,
//----------------------------------------------------------------------------
INKReturnCode
-INKHttpCacheReenable(INKCacheTxn txnp, const INKEvent event, const void *data, const INKU64 size)
+INKHttpCacheReenable(INKCacheTxn txnp, const INKEvent event, const void *data, const uint64 size)
{
Debug("cache_plugin", "[INKHttpCacheReenable] event id: %d data: %lX size: %llu", event, (unsigned long) data, size);
//bool calledUser = 0;
@@ -6376,7 +6377,7 @@ INKHttpTxnClientReqHdrBytesGet(INKHttpTx
}
int
-INKHttpTxnClientReqBodyBytesGet(INKHttpTxn txnp, int *bytes)
+INKHttpTxnClientReqBodyBytesGet(INKHttpTxn txnp, int64 *bytes)
{
HttpSM *sm = (HttpSM *) txnp;
*bytes = sm->client_request_body_bytes;
@@ -6392,7 +6393,7 @@ INKHttpTxnServerReqHdrBytesGet(INKHttpTx
}
int
-INKHttpTxnServerReqBodyBytesGet(INKHttpTxn txnp, int *bytes)
+INKHttpTxnServerReqBodyBytesGet(INKHttpTxn txnp, int64 *bytes)
{
HttpSM *sm = (HttpSM *) txnp;
*bytes = sm->server_request_body_bytes;
@@ -6408,7 +6409,7 @@ INKHttpTxnServerRespHdrBytesGet(INKHttpT
}
int
-INKHttpTxnServerRespBodyBytesGet(INKHttpTxn txnp, int *bytes)
+INKHttpTxnServerRespBodyBytesGet(INKHttpTxn txnp, int64 *bytes)
{
HttpSM *sm = (HttpSM *) txnp;
*bytes = sm->server_response_body_bytes;
@@ -6424,7 +6425,7 @@ INKHttpTxnClientRespHdrBytesGet(INKHttpT
}
int
-INKHttpTxnClientRespBodyBytesGet(INKHttpTxn txnp, int *bytes)
+INKHttpTxnClientRespBodyBytesGet(INKHttpTxn txnp, int64 *bytes)
{
HttpSM *sm = (HttpSM *) txnp;
*bytes = sm->client_response_body_bytes;
@@ -6448,57 +6449,33 @@ INKHttpTxnPushedRespBodyBytesGet(INKHttp
}
int
-INKHttpTxnStartTimeGet(INKHttpTxn txnp, INK64 *start_time)
+INKHttpTxnStartTimeGet(INKHttpTxn txnp, ink_hrtime *start_time)
{
HttpSM *sm = (HttpSM *) txnp;
- if (sm->milestones.ua_begin == 0)
- return 0;
- else {
- *start_time = (int64) (sm->milestones.ua_begin);
- return 1;
- }
-}
-int
-INKHttpTxnEndTimeGet(INKHttpTxn txnp, INK64 *end_time)
-{
- HttpSM *sm = (HttpSM *) txnp;
- if (sm->milestones.ua_close == 0)
- return 0;
- else {
- *end_time = (int64) (sm->milestones.ua_close);
- return 1;
- }
-}
-
-int
-INKHttpTxnStartTimeGetD(INKHttpTxn txnp, double *start_time)
-{
- HttpSM *sm = (HttpSM *) txnp;
if (sm->milestones.ua_begin == 0)
return 0;
else {
- //*start_time = (long long)(ink_hrtime_to_msec(sm->milestones.ua_begin));
- *start_time = (double) (sm->milestones.ua_begin);
+ *start_time = sm->milestones.ua_begin;
return 1;
}
}
int
-INKHttpTxnEndTimeGetD(INKHttpTxn txnp, double *end_time)
+INKHttpTxnEndTimeGet(INKHttpTxn txnp, ink_hrtime *end_time)
{
HttpSM *sm = (HttpSM *) txnp;
+
if (sm->milestones.ua_close == 0)
return 0;
else {
- //*end_time = (long long)(ink_hrtime_to_msec(sm->milestones.ua_close));
- *end_time = (double) (sm->milestones.ua_close);
+ *end_time = sm->milestones.ua_close;
return 1;
}
}
int
-INKHttpTxnCachedRespTimeGet(INKHttpTxn txnp, long *resp_time)
+INKHttpTxnCachedRespTimeGet(INKHttpTxn txnp, time_t *resp_time)
{
HttpSM *sm = (HttpSM *) txnp;
HTTPInfo *cached_obj = sm->t_state.cache_info.object_read;
@@ -6506,7 +6483,7 @@ INKHttpTxnCachedRespTimeGet(INKHttpTxn t
if (cached_obj == NULL || !cached_obj->valid())
return 0;
- *resp_time = (long) (cached_obj->response_received_time_get());
+ *resp_time = cached_obj->response_received_time_get();
return 1;
}
@@ -6795,7 +6772,7 @@ INKVConnClosedGet(INKVConn connp)
}
INKVIO
-INKVConnRead(INKVConn connp, INKCont contp, INKIOBuffer bufp, int nbytes)
+INKVConnRead(INKVConn connp, INKCont contp, INKIOBuffer bufp, int64 nbytes)
{
if ((sdk_sanity_check_iocore_structure(connp) != INK_SUCCESS) ||
(sdk_sanity_check_iocore_structure(contp) != INK_SUCCESS) ||
@@ -6808,7 +6785,7 @@ INKVConnRead(INKVConn connp, INKCont con
}
INKVIO
-INKVConnWrite(INKVConn connp, INKCont contp, INKIOBufferReader readerp, int nbytes)
+INKVConnWrite(INKVConn connp, INKCont contp, INKIOBufferReader readerp, int64 nbytes)
{
if ((sdk_sanity_check_iocore_structure(connp) != INK_SUCCESS) ||
(sdk_sanity_check_iocore_structure(contp) != INK_SUCCESS) ||
@@ -6861,7 +6838,7 @@ INKVConnShutdown(INKVConn connp, int rea
}
INKReturnCode
-INKVConnCacheObjectSizeGet(INKVConn connp, int *obj_size)
+INKVConnCacheObjectSizeGet(INKVConn connp, int64 *obj_size)
{
if ((sdk_sanity_check_iocore_structure(connp) != INK_SUCCESS) || (obj_size == NULL))
return INK_ERROR;
@@ -7330,7 +7307,7 @@ INKStatCreate(const char *the_name, INKS
}
INKReturnCode
-INKStatIntAddTo(INKStat the_stat, INK64 amount)
+INKStatIntAddTo(INKStat the_stat, int64 amount)
{
if (ink_sanity_check_stat_structure(the_stat) != INK_SUCCESS)
return INK_ERROR;
@@ -7375,93 +7352,79 @@ INKStatIncrement(INKStat the_stat)
#if TS_HAS_V2STATS
INKReturnCode
-INKStatCreateV2(
- const char *the_name,
- uint32_t *stat_num)
+INKStatCreateV2(const char *the_name, uint32_t *stat_num)
{
- if(StatSystemV2::registerStat(the_name, stat_num)) {
- return INK_SUCCESS;
- }
- return INK_ERROR;
+ if(StatSystemV2::registerStat(the_name, stat_num)) {
+ return INK_SUCCESS;
+ }
+ return INK_ERROR;
}
INKReturnCode
-INKStatIncrementV2(
- uint32_t stat_num,
- INK64 inc_by)
+INKStatIncrementV2(uint32_t stat_num, int64 inc_by)
{
- if(StatSystemV2::increment(stat_num, inc_by)) {
- return INK_SUCCESS;
- }
- return INK_ERROR;
+ if(StatSystemV2::increment(stat_num, inc_by)) {
+ return INK_SUCCESS;
+ }
+ return INK_ERROR;
}
INKReturnCode
-INKStatIncrementByNameV2(
- const char *stat_name,
- INK64 inc_by)
+INKStatIncrementByNameV2(const char *stat_name, int64 inc_by)
{
- if(StatSystemV2::increment(stat_name, inc_by)) {
- return INK_SUCCESS;
- }
- return INK_ERROR;
+ if(StatSystemV2::increment(stat_name, inc_by)) {
+ return INK_SUCCESS;
+ }
+ return INK_ERROR;
}
INKReturnCode
-INKStatDecrementV2(
- uint32_t stat_num,
- INK64 dec_by)
+INKStatDecrementV2(uint32_t stat_num, int64 dec_by)
{
- return INKStatIncrementV2(stat_num, (-1)*dec_by);
+ return INKStatIncrementV2(stat_num, (-1)*dec_by);
}
INKReturnCode
-INKStatDecrementByNameV2(
- const char *stat_name,
- INK64 dec_by)
+INKStatDecrementByNameV2(const char *stat_name, int64 dec_by)
{
- return INKStatIncrementByNameV2(stat_name, (-1)*dec_by);
+ return INKStatIncrementByNameV2(stat_name, (-1)*dec_by);
}
INKReturnCode
-INKStatGetCurrentV2(
- uint32_t stat_num, INK64 *stat_val)
+INKStatGetCurrentV2(uint32_t stat_num, int64 *stat_val)
{
- if(StatSystemV2::get_current(stat_num, stat_val))
- return INK_SUCCESS;
- return INK_ERROR;
+ if(StatSystemV2::get_current(stat_num, stat_val))
+ return INK_SUCCESS;
+ return INK_ERROR;
}
INKReturnCode
-INKStatGetCurrentByNameV2(
- const char *stat_name, INK64 *stat_val)
+INKStatGetCurrentByNameV2(const char *stat_name, int64 *stat_val)
{
- if(StatSystemV2::get_current(stat_name, stat_val))
- return INK_SUCCESS;
- return INK_ERROR;
+ if(StatSystemV2::get_current(stat_name, stat_val))
+ return INK_SUCCESS;
+ return INK_ERROR;
}
INKReturnCode
-INKStatGetV2(
- uint32_t stat_num, INK64 *stat_val)
+INKStatGetV2(uint32_t stat_num, int64 *stat_val)
{
- if(StatSystemV2::get(stat_num, stat_val))
- return INK_SUCCESS;
- return INK_ERROR;
+ if(StatSystemV2::get(stat_num, stat_val))
+ return INK_SUCCESS;
+ return INK_ERROR;
}
INKReturnCode
-INKStatGetByNameV2(
- const char *stat_name, INK64 *stat_val)
+INKStatGetByNameV2(const char *stat_name, int64 *stat_val)
{
- if(StatSystemV2::get(stat_name, stat_val))
- return INK_SUCCESS;
- return INK_ERROR;
+ if(StatSystemV2::get(stat_name, stat_val))
+ return INK_SUCCESS;
+ return INK_ERROR;
}
#endif
INKReturnCode
-INKStatIntGet(INKStat the_stat, INK64 *value)
+INKStatIntGet(INKStat the_stat, int64 *value)
{
if (ink_sanity_check_stat_structure(the_stat) != INK_SUCCESS)
return INK_ERROR;
@@ -7483,13 +7446,13 @@ INKStatFloatGet(INKStat the_stat, float
}
//deprecated in SDK3.0
-INK64
+int64
INKStatIntRead(INKStat the_stat)
{
if (ink_sanity_check_stat_structure(the_stat) != INK_SUCCESS)
return 0;
- INK64 stat_val;
+ int64 stat_val;
StatDescriptor *statp = (StatDescriptor *) the_stat;
stat_val = statp->int_value();
return stat_val;
@@ -7509,7 +7472,7 @@ INKStatFloatRead(INKStat the_stat)
}
INKReturnCode
-INKStatIntSet(INKStat the_stat, INK64 value)
+INKStatIntSet(INKStat the_stat, int64 value)
{
if (ink_sanity_check_stat_structure(the_stat) != INK_SUCCESS)
return INK_ERROR;
@@ -7819,7 +7782,7 @@ INKHttpTxnClientRemotePortGet(INKHttpTxn
void
-INKIPLookupNewEntry(INKIPLookup iplu, INKU32 addr1, INKU32 addr2, void *data)
+INKIPLookupNewEntry(INKIPLookup iplu, uint32 addr1, uint32 addr2, void *data)
{
IpLookup *my_iplu = (IpLookup *) iplu;
if (my_iplu) {
@@ -7828,7 +7791,7 @@ INKIPLookupNewEntry(INKIPLookup iplu, IN
}
int
-INKIPLookupMatch(INKIPLookup iplu, INKU32 addr, void **data)
+INKIPLookupMatch(INKIPLookup iplu, uint32 addr, void **data)
{
void *dummy;
IpLookup *my_iplu = (IpLookup *) iplu;
@@ -7839,7 +7802,7 @@ INKIPLookupMatch(INKIPLookup iplu, INKU3
}
int
-INKIPLookupMatchFirst(INKIPLookup iplu, INKU32 addr, INKIPLookupState iplus, void **data)
+INKIPLookupMatchFirst(INKIPLookup iplu, uint32 addr, INKIPLookupState iplus, void **data)
{
IpLookup *my_iplu = (IpLookup *) iplu;
IpLookupState *my_iplus = (IpLookupState *) iplus;
@@ -7883,7 +7846,7 @@ INKMatcherTokLine(char *buffer, char **l
}
char *
-INKMatcherExtractIPRange(char *match_str, INKU32 *addr1, INKU32 *addr2)
+INKMatcherExtractIPRange(char *match_str, uint32 *addr1, uint32 *addr2)
{
return (char*)ExtractIpRange(match_str, (ip_addr_t *) addr1, (ip_addr_t *) addr2);
}
@@ -8067,7 +8030,7 @@ INKCacheHttpInfoKeySet(INKCacheHttpInfo
}
void
-INKCacheHttpInfoSizeSet(INKCacheHttpInfo infop, INKU64 size)
+INKCacheHttpInfoSizeSet(INKCacheHttpInfo infop, int64 size)
{
CacheHTTPInfo *info = (CacheHTTPInfo *) infop;
info->object_size_set(size);
@@ -8183,7 +8146,7 @@ INKHttpIsInternalRequest(INKHttpTxn txnp
INKReturnCode
-INKAIORead(int fd, INKU64 offset, char* buf, INKU64 buffSize, INKCont contp)
+INKAIORead(int fd, off_t offset, char* buf, size_t buffSize, INKCont contp)
{
if (sdk_sanity_check_iocore_structure (contp) != INK_SUCCESS) {
@@ -8227,7 +8190,7 @@ INKAIONBytesGet(void *data)
}
INKReturnCode
-INKAIOWrite(int fd, INKU64 offset, char* buf, const INKU64 bufSize, INKCont contp)
+INKAIOWrite(int fd, off_t offset, char* buf, const size_t bufSize, INKCont contp)
{
if (sdk_sanity_check_iocore_structure (contp) != INK_SUCCESS) {
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Fri Oct 29 22:11:12 2010
@@ -409,7 +409,7 @@ cache_handler(INKCont contp, INKEvent ev
INKIOBufferBlock blockp;
char *ptr_block;
- int ntodo, ndone, nbytes, towrite, avail, content_length;
+ int64 ntodo, ndone, nbytes, towrite, avail, content_length;
switch (event) {
case INK_EVENT_CACHE_OPEN_WRITE:
@@ -833,7 +833,7 @@ REGRESSION_TEST(SDK_API_INKfopen) (Regre
struct stat stat_buffer_pre, stat_buffer_post, stat_buffer_input;
char *ret_val;
int error_counter = 0, read = 0, wrote = 0;
- off_t read_amount = 0;
+ int64 read_amount = 0;
char INPUT_TEXT_FILE[] = "plugin.config";
char input_file_full_path[BUFSIZ];
@@ -1558,7 +1558,7 @@ REGRESSION_TEST(SDK_API_INKIOBufferCreat
bool test_passed = false;
*pstatus = REGRESSION_TEST_INPROGRESS;
- int watermark = 1000;
+ int64 watermark = 1000;
INKIOBuffer bufp = INKIOBufferCreate();
@@ -1784,7 +1784,7 @@ REGRESSION_TEST(SDK_API_INKIOBufferBlock
INKIOBufferWrite(bufp, (char*)&i, sizeof(int));
INKIOBufferReader readerp = INKIOBufferReaderAlloc(bufp);
- int avail_write, avail_read;
+ int64 avail_write, avail_read;
// TODO: This is probably not correct any more.
INKIOBufferBlock blockp = INKIOBufferStart(bufp);
@@ -1875,7 +1875,7 @@ REGRESSION_TEST(SDK_API_INKStatIntSet) (
INKStat stat = INKStatCreate("stat_is", INKSTAT_TYPE_INT64);
INKStatIntSet(stat, 100);
- INK64 stat_val;
+ int64 stat_val;
INKStatIntGet(stat, &stat_val);
@@ -1906,7 +1906,7 @@ REGRESSION_TEST(SDK_API_INKStatIntAddTo)
INKStat stat = INKStatCreate("stat_ia", INKSTAT_TYPE_INT64);
INKStatIntAddTo(stat, 100);
- INK64 stat_val;
+ int64 stat_val;
INKStatIntGet(stat, &stat_val);
@@ -2003,7 +2003,7 @@ REGRESSION_TEST(SDK_API_INKStatIncrement
INKStat stat_2 = INKStatCreate("stat_2", INKSTAT_TYPE_FLOAT);
INKStatIncrement(stat_1);
- INK64 stat1_val;
+ int64 stat1_val;
INKStatIntGet(stat_1, &stat1_val);
if (stat1_val == 1) {
@@ -2119,9 +2119,9 @@ REGRESSION_TEST(SDK_API_INKStatCoupled)
float global_val_sum;
INKStatFloatGet(global_stat_sum, &global_val_sum);
- INK64 global_val_1;
+ int64 global_val_1;
INKStatIntGet(global_stat_1, &global_val_1);
- INK64 global_val_2;
+ int64 global_val_2;
INKStatIntGet(global_stat_2, &global_val_2);
if (local_val_1 == global_val_1 && local_val_2 == global_val_2 && local_val_sum == global_val_sum) {
@@ -2762,7 +2762,7 @@ test_url_print(INKMBuffer bufp, INKMLoc
INKIOBufferBlock block;
const char *block_start;
- int block_avail;
+ int64 block_avail;
char *output_string;
int output_len;
@@ -4098,7 +4098,7 @@ REGRESSION_TEST(SDK_API_INKHttpHdr) (Reg
while ((iobufblock != NULL) && (iobufblock != INK_ERROR_PTR)) {
const char *block_start;
- int block_size;
+ int64 block_size;
block_start = INKIOBufferBlockReadStart(iobufblock, iobufreader, &block_size);
if ((block_start == INK_ERROR_PTR) || (block_size == 0) || (block_size == INK_ERROR)) {
@@ -5263,7 +5263,7 @@ convert_http_hdr_to_string(INKMBuffer bu
INKIOBufferBlock block;
const char *block_start;
- int block_avail;
+ int64 block_avail;
char *output_string;
int output_len;
@@ -5522,7 +5522,7 @@ convert_mime_hdr_to_string(INKMBuffer bu
INKIOBufferBlock block;
const char *block_start;
- int block_avail;
+ int64 block_avail;
char *output_string;
int output_len;
@@ -7619,7 +7619,7 @@ load(const char *append_string)
{
INKIOBufferBlock blk;
char *p;
- int avail;
+ int64 avail;
append_buffer = INKIOBufferCreate();
append_buffer_reader = INKIOBufferReaderAlloc(append_buffer);
Modified: trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITestTool.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITestTool.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITestTool.cc Fri Oct 29 22:11:12 2010
@@ -120,7 +120,7 @@ typedef struct
int connect_port;
int local_port;
- INKU64 connect_ip;
+ uint64 connect_ip;
INKAction connect_action;
TxnHandler current_handler;
@@ -526,7 +526,7 @@ synclient_txn_read_response(INKCont cont
INKIOBufferBlock block = INKIOBufferReaderStart(txn->resp_reader);
while (block != NULL) {
- int blocklen;
+ int64 blocklen;
const char *blockptr = INKIOBufferBlockReadStart(block, txn->resp_reader, &blocklen);
if (txn->response_len+blocklen <= RESPONSE_MAX_SIZE) {
@@ -603,7 +603,7 @@ synclient_txn_write_request(INKCont cont
INKIOBufferBlock block;
char *ptr_block;
- int len, ndone, ntodo, towrite, avail;
+ int64 len, ndone, ntodo, towrite, avail;
len = strlen(txn->request);
@@ -854,7 +854,7 @@ synserver_txn_write_response(INKCont con
INKIOBufferBlock block;
char *ptr_block;
- int len, ndone, ntodo, towrite, avail;
+ int64 len, ndone, ntodo, towrite, avail;
char *response;
response = generate_response(txn->request);
@@ -930,7 +930,7 @@ synserver_txn_read_request(INKCont contp
INKIOBufferBlock block = INKIOBufferReaderStart(txn->req_reader);
while (block != NULL) {
- int blocklen;
+ int64 blocklen;
const char *blockptr = INKIOBufferBlockReadStart(block, txn->req_reader, &blocklen);
if (txn->request_len+blocklen <= REQUEST_MAX_SIZE) {
Modified: trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc Fri Oct 29 22:11:12 2010
@@ -297,7 +297,7 @@ INKVIOReaderGet(INKVIO viop)
return vio->get_reader();
}
-int
+int64
INKVIONBytesGet(INKVIO viop)
{
if (sdk_sanity_check_iocore_structure(viop) != INK_SUCCESS)
@@ -308,7 +308,7 @@ INKVIONBytesGet(INKVIO viop)
}
INKReturnCode
-INKVIONBytesSet(INKVIO viop, int nbytes)
+INKVIONBytesSet(INKVIO viop, int64 nbytes)
{
if ((sdk_sanity_check_iocore_structure(viop) != INK_SUCCESS) || nbytes < 0)
return INK_ERROR;
@@ -318,7 +318,7 @@ INKVIONBytesSet(INKVIO viop, int nbytes)
return INK_SUCCESS;
}
-int
+int64
INKVIONDoneGet(INKVIO viop)
{
if (sdk_sanity_check_iocore_structure(viop) != INK_SUCCESS)
@@ -329,7 +329,7 @@ INKVIONDoneGet(INKVIO viop)
}
INKReturnCode
-INKVIONDoneSet(INKVIO viop, int ndone)
+INKVIONDoneSet(INKVIO viop, int64 ndone)
{
if ((sdk_sanity_check_iocore_structure(viop) != INK_SUCCESS) || ndone < 0)
return INK_ERROR;
@@ -339,7 +339,7 @@ INKVIONDoneSet(INKVIO viop, int ndone)
return INK_SUCCESS;
}
-int
+int64
INKVIONTodoGet(INKVIO viop)
{
if (sdk_sanity_check_iocore_structure(viop) != INK_SUCCESS)
@@ -381,18 +381,12 @@ INKVIOMutexGet(INKVIO viop)
/* High Resolution Time */
-unsigned int
+ink_hrtime
INKBasedTimeGet()
{
return ink_get_based_hrtime();
}
-double
-INKBasedTimeGetD()
-{
- return (double) ink_get_based_hrtime();
-}
-
/* UDP Connection Interface */
INKAction
@@ -403,7 +397,7 @@ INKUDPBind(INKCont contp, unsigned int i
}
INKAction
-INKUDPSendTo(INKCont contp, INKUDPConn udp, unsigned int ip, int port, char *data, int len)
+INKUDPSendTo(INKCont contp, INKUDPConn udp, unsigned int ip, int port, char *data, int64 len)
{
FORCE_PLUGIN_MUTEX(contp);
UDPPacket *packet = new_UDPPacket();
@@ -583,8 +577,8 @@ INKIOBufferAppend(INKIOBuffer bufp, INKI
return INK_SUCCESS;
}
-int
-INKIOBufferCopy(INKIOBuffer bufp, INKIOBufferReader readerp, int length, int offset)
+int64
+INKIOBufferCopy(INKIOBuffer bufp, INKIOBufferReader readerp, int64 length, int64 offset)
{
if ((sdk_sanity_check_iocore_structure(bufp) != INK_SUCCESS) ||
(sdk_sanity_check_iocore_structure(readerp) != INK_SUCCESS) || length < 0 || offset < 0)
@@ -596,8 +590,8 @@ INKIOBufferCopy(INKIOBuffer bufp, INKIOB
return b->write(r, length, offset);
}
-int
-INKIOBufferWrite(INKIOBuffer bufp, const void *buf, int length)
+int64
+INKIOBufferWrite(INKIOBuffer bufp, const void *buf, int64 length)
{
if ((sdk_sanity_check_iocore_structure(bufp) != INK_SUCCESS) || (buf == NULL) || (length < 0)) {
return INK_ERROR;
@@ -609,14 +603,14 @@ INKIOBufferWrite(INKIOBuffer bufp, const
// not in SDK3.0
void
-INKIOBufferReaderCopy(INKIOBufferReader readerp, const void *buf, int length)
+INKIOBufferReaderCopy(INKIOBufferReader readerp, const void *buf, int64 length)
{
IOBufferReader *r = (IOBufferReader *) readerp;
r->memcpy(buf, length);
}
INKReturnCode
-INKIOBufferProduce(INKIOBuffer bufp, int nbytes)
+INKIOBufferProduce(INKIOBuffer bufp, int64 nbytes)
{
if ((sdk_sanity_check_iocore_structure(bufp) != INK_SUCCESS) || nbytes < 0)
return INK_ERROR;
@@ -627,7 +621,7 @@ INKIOBufferProduce(INKIOBuffer bufp, int
}
INKIOBufferData
-INKIOBufferDataCreate(void *data, int size, INKIOBufferDataFlags flags)
+INKIOBufferDataCreate(void *data, int64 size, INKIOBufferDataFlags flags)
{
#ifdef DEBUG
if (data == NULL || data == INK_ERROR_PTR || size <= 0 ||
@@ -656,7 +650,7 @@ INKIOBufferDataCreate(void *data, int si
}
INKIOBufferBlock
-INKIOBufferBlockCreate(INKIOBufferData datap, int size, int offset)
+INKIOBufferBlockCreate(INKIOBufferData datap, int64 size, int64 offset)
{
if ((sdk_sanity_check_iocore_structure(datap) != INK_SUCCESS) || size < 0 || offset < 0)
return (INKIOBufferBlock) INK_ERROR;
@@ -686,7 +680,7 @@ INKIOBufferBlockNext(INKIOBufferBlock bl
}
// dev API, not exposed
-int
+int64
INKIOBufferBlockDataSizeGet(INKIOBufferBlock blockp)
{
IOBufferBlock *blk = (IOBufferBlock *) blockp;
@@ -694,7 +688,7 @@ INKIOBufferBlockDataSizeGet(INKIOBufferB
}
const char *
-INKIOBufferBlockReadStart(INKIOBufferBlock blockp, INKIOBufferReader readerp, int *avail)
+INKIOBufferBlockReadStart(INKIOBufferBlock blockp, INKIOBufferReader readerp, int64 *avail)
{
if ((sdk_sanity_check_iocore_structure(blockp) != INK_SUCCESS) ||
(sdk_sanity_check_iocore_structure(readerp) != INK_SUCCESS))
@@ -722,7 +716,7 @@ INKIOBufferBlockReadStart(INKIOBufferBlo
return (const char *) p;
}
-int
+int64
INKIOBufferBlockReadAvail(INKIOBufferBlock blockp, INKIOBufferReader readerp)
{
if ((sdk_sanity_check_iocore_structure(blockp) != INK_SUCCESS) ||
@@ -731,7 +725,7 @@ INKIOBufferBlockReadAvail(INKIOBufferBlo
IOBufferBlock *blk = (IOBufferBlock *) blockp;
IOBufferReader *reader = (IOBufferReader *) readerp;
- int avail;
+ int64 avail;
avail = blk->read_avail();
@@ -746,7 +740,7 @@ INKIOBufferBlockReadAvail(INKIOBufferBlo
}
char *
-INKIOBufferBlockWriteStart(INKIOBufferBlock blockp, int *avail)
+INKIOBufferBlockWriteStart(INKIOBufferBlock blockp, int64 *avail)
{
if (sdk_sanity_check_iocore_structure(blockp) != INK_SUCCESS)
return (char *) INK_ERROR_PTR;
@@ -758,7 +752,7 @@ INKIOBufferBlockWriteStart(INKIOBufferBl
return blk->end();
}
-int
+int64
INKIOBufferBlockWriteAvail(INKIOBufferBlock blockp)
{
if (sdk_sanity_check_iocore_structure(blockp) != INK_SUCCESS) {
@@ -770,7 +764,7 @@ INKIOBufferBlockWriteAvail(INKIOBufferBl
}
INKReturnCode
-INKIOBufferWaterMarkGet(INKIOBuffer bufp, int *water_mark)
+INKIOBufferWaterMarkGet(INKIOBuffer bufp, int64 *water_mark)
{
if ((sdk_sanity_check_iocore_structure(bufp) != INK_SUCCESS) || (water_mark == NULL)) {
return INK_ERROR;
@@ -782,7 +776,7 @@ INKIOBufferWaterMarkGet(INKIOBuffer bufp
}
INKReturnCode
-INKIOBufferWaterMarkSet(INKIOBuffer bufp, int water_mark)
+INKIOBufferWaterMarkSet(INKIOBuffer bufp, int64 water_mark)
{
if ((sdk_sanity_check_iocore_structure(bufp) != INK_SUCCESS) || water_mark < 0)
return INK_ERROR;
@@ -843,7 +837,7 @@ INKIOBufferReaderStart(INKIOBufferReader
}
INKReturnCode
-INKIOBufferReaderConsume(INKIOBufferReader readerp, int nbytes)
+INKIOBufferReaderConsume(INKIOBufferReader readerp, int64 nbytes)
{
if ((sdk_sanity_check_iocore_structure(readerp) != INK_SUCCESS) || nbytes < 0)
return INK_ERROR;
@@ -853,7 +847,7 @@ INKIOBufferReaderConsume(INKIOBufferRead
return INK_SUCCESS;
}
-int
+int64
INKIOBufferReaderAvail(INKIOBufferReader readerp)
{
if (sdk_sanity_check_iocore_structure(readerp) != INK_SUCCESS)
Modified: trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h Fri Oct 29 22:11:12 2010
@@ -200,8 +200,8 @@ extern "C"
/* IOBuffer */
- inkapi void INKIOBufferReaderCopy(INKIOBufferReader, const void *, int);
- inkapi int INKIOBufferBlockDataSizeGet(INKIOBufferBlock blockp);
+ inkapi void INKIOBufferReaderCopy(INKIOBufferReader readerp, const void *buf, int64 length);
+ inkapi int64 INKIOBufferBlockDataSizeGet(INKIOBufferBlock blockp);
inkapi INKReturnCode INKIOBufferBlockDestroy(INKIOBufferBlock blockp);
Modified: trafficserver/traffic/trunk/proxy/api/ts/experimental.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/experimental.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/experimental.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/experimental.h Fri Oct 29 22:11:12 2010
@@ -39,7 +39,7 @@ extern "C"
/* Cache APIs that are not yet fully supported and/or frozen nor complete. */
- inkapi INKReturnCode INKCacheBufferInfoGet(INKCacheTxn txnp, INKU64 * length, INKU64 * offset);
+ inkapi INKReturnCode INKCacheBufferInfoGet(INKCacheTxn txnp, uint64 * length, uint64 * offset);
inkapi INKCacheHttpInfo INKCacheHttpInfoCreate();
inkapi void INKCacheHttpInfoReqGet(INKCacheHttpInfo infop, INKMBuffer * bufp, INKMLoc * obj);
@@ -47,7 +47,7 @@ extern "C"
inkapi void INKCacheHttpInfoReqSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
inkapi void INKCacheHttpInfoRespSet(INKCacheHttpInfo infop, INKMBuffer bufp, INKMLoc obj);
inkapi void INKCacheHttpInfoKeySet(INKCacheHttpInfo infop, INKCacheKey key);
- inkapi void INKCacheHttpInfoSizeSet(INKCacheHttpInfo infop, INKU64 size);
+ inkapi void INKCacheHttpInfoSizeSet(INKCacheHttpInfo infop, int64 size);
inkapi int INKCacheHttpInfoVector(INKCacheHttpInfo infop, void *data, int length);
/* --------------------------------------------------------------------------
@@ -55,14 +55,14 @@ extern "C"
TS stats. It is disabled by default, enable it with --with_v2_stats at
configure time. */
inkapi INKReturnCode INKStatCreateV2(const char *name, uint32_t *stat_num);
- inkapi INKReturnCode INKStatIncrementV2(uint32_t stat_num, INK64 inc_by);
- inkapi INKReturnCode INKStatIncrementByNameV2(const char *stat_name, INK64 inc_by);
- inkapi INKReturnCode INKStatDecrementV2(uint32_t stat_num, INK64 dec_by);
- inkapi INKReturnCode INKStatDecrementByNameV2(const char *stat_name, INK64 dec_by);
- inkapi INKReturnCode INKStatGetCurrentV2(uint32_t stat_num, INK64 *stat_val);
- inkapi INKReturnCode INKStatGetCurrentByNameV2(const char *stat_name, INK64 *stat_val);
- inkapi INKReturnCode INKStatGetV2(uint32_t stat_num, INK64 *stat_val);
- inkapi INKReturnCode INKStatGetByNameV2(const char *stat_name, INK64 *stat_val);
+ inkapi INKReturnCode INKStatIncrementV2(uint32_t stat_num, int64 inc_by);
+ inkapi INKReturnCode INKStatIncrementByNameV2(const char *stat_name, int64 inc_by);
+ inkapi INKReturnCode INKStatDecrementV2(uint32_t stat_num, int64 dec_by);
+ inkapi INKReturnCode INKStatDecrementByNameV2(const char *stat_name, int64 dec_by);
+ inkapi INKReturnCode INKStatGetCurrentV2(uint32_t stat_num, int64 *stat_val);
+ inkapi INKReturnCode INKStatGetCurrentByNameV2(const char *stat_name, int64 *stat_val);
+ inkapi INKReturnCode INKStatGetV2(uint32_t stat_num, int64 *stat_val);
+ inkapi INKReturnCode INKStatGetByNameV2(const char *stat_name, int64 *stat_val);
#ifdef __cplusplus
}
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h Fri Oct 29 22:11:12 2010
@@ -437,16 +437,18 @@ extern "C"
} INKFetchWakeUpOptions;
extern inkapi const void *INK_ERROR_PTR;
- typedef int INK32;
- typedef unsigned int INKU32;
- typedef long long INK64;
- typedef unsigned long long INKU64;
+ typedef int int32;
+ typedef unsigned int uint32;
+ typedef long long int64;
+ typedef unsigned long long uint64;
+
+ typedef int64 TSHRTime;
/* These typedefs are used with the corresponding INKMgmt*Get functions
for storing the values retrieved by those functions. For example,
INKMgmtCounterGet() retrieves an INKMgmtCounter. */
- typedef INK64 INKMgmtInt;
- typedef INK64 INKMgmtCounter;
+ typedef int64 INKMgmtInt;
+ typedef int64 INKMgmtCounter;
typedef float INKMgmtFloat;
typedef char *INKMgmtString;
@@ -800,9 +802,9 @@ extern "C"
#define INKstrndup(p,n) _INKstrdup ((p), (n), INK_RES_MEM_PATH)
#define INKfree(p) _INKfree (p)
- inkapi void *_INKmalloc(unsigned int size, const char *path);
- inkapi void *_INKrealloc(void *ptr, unsigned int size, const char *path);
- inkapi char *_INKstrdup(const char *str, int length, const char *path);
+ inkapi void *_INKmalloc(size_t size, const char *path);
+ inkapi void *_INKrealloc(void *ptr, size_t size, const char *path);
+ inkapi char *_INKstrdup(const char *str, int64 length, const char *path);
inkapi void _INKfree(void *ptr);
/* --------------------------------------------------------------------------
@@ -940,7 +942,7 @@ extern "C"
while reading the file, it returns -1.
*/
- inkapi int INKfread(INKFile filep, void *buf, int length);
+ inkapi size_t INKfread(INKFile filep, void *buf, size_t length);
/**
Attempts to write length bytes of data from the buffer buf
@@ -957,7 +959,7 @@ extern "C"
writing, it returns the number of bytes successfully written.
*/
- inkapi int INKfwrite(INKFile filep, const void *buf, int length);
+ inkapi size_t INKfwrite(INKFile filep, const void *buf, size_t length);
/**
Flushes pending data that has been buffered up in memory from
@@ -981,7 +983,7 @@ extern "C"
@return pointer to the string read into the buffer buf.
*/
- inkapi char *INKfgets(INKFile filep, char *buf, int length);
+ inkapi char *INKfgets(INKFile filep, char *buf, size_t length);
/* --------------------------------------------------------------------------
Error logging */
@@ -1914,8 +1916,8 @@ extern "C"
inkapi INKReturnCode INKContDestroy(INKCont contp);
inkapi INKReturnCode INKContDataSet(INKCont contp, void *data);
inkapi void *INKContDataGet(INKCont contp);
- inkapi INKAction INKContSchedule(INKCont contp, unsigned int timeout);
- inkapi INKAction INKHttpSchedule(INKCont contp, INKHttpTxn txnp, unsigned int timeout);
+ inkapi INKAction INKContSchedule(INKCont contp, TSHRTime timeout);
+ inkapi INKAction INKHttpSchedule(INKCont contp, INKHttpTxn txnp, TSHRTime timeout);
inkapi int INKContCall(INKCont contp, INKEvent event, void *edata);
inkapi INKMutex INKContMutexGet(INKCont contp);
@@ -2005,8 +2007,7 @@ extern "C"
*/
inkapi INKReturnCode INKHttpTxnReenable(INKHttpTxn txnp, INKEvent event);
- inkapi INKReturnCode INKHttpCacheReenable(INKCacheTxn txnp, const INKEvent event, const void *data,
- const INKU64 size);
+ inkapi INKReturnCode INKHttpCacheReenable(INKCacheTxn txnp, const INKEvent event, const void *data, const uint64 size);
inkapi INKReturnCode INKHttpTxnFollowRedirect(INKHttpTxn txnp, int on);
inkapi int INKHttpTxnGetMaxArgCnt(void);
inkapi INKReturnCode INKHttpTxnSetArg(INKHttpTxn txnp, int arg_idx, void *arg);
@@ -2128,15 +2129,15 @@ extern "C"
inkapi INKVIO INKVConnWriteVIOGet(INKVConn connp);
inkapi int INKVConnClosedGet(INKVConn connp);
- inkapi INKVIO INKVConnRead(INKVConn connp, INKCont contp, INKIOBuffer bufp, int nbytes);
- inkapi INKVIO INKVConnWrite(INKVConn connp, INKCont contp, INKIOBufferReader readerp, int nbytes);
+ inkapi INKVIO INKVConnRead(INKVConn connp, INKCont contp, INKIOBuffer bufp, int64 nbytes);
+ inkapi INKVIO INKVConnWrite(INKVConn connp, INKCont contp, INKIOBufferReader readerp, int64 nbytes);
inkapi INKReturnCode INKVConnClose(INKVConn connp);
inkapi INKReturnCode INKVConnAbort(INKVConn connp, int error);
inkapi INKReturnCode INKVConnShutdown(INKVConn connp, int read, int write);
/* --------------------------------------------------------------------------
Cache VConnections */
- inkapi INKReturnCode INKVConnCacheObjectSizeGet(INKVConn connp, int *obj_size);
+ inkapi INKReturnCode INKVConnCacheObjectSizeGet(INKVConn connp, int64 *obj_size);
/* --------------------------------------------------------------------------
Transformations */
@@ -2277,11 +2278,11 @@ extern "C"
inkapi INKReturnCode INKVIOReenable(INKVIO viop);
inkapi INKIOBuffer INKVIOBufferGet(INKVIO viop);
inkapi INKIOBufferReader INKVIOReaderGet(INKVIO viop);
- inkapi int INKVIONBytesGet(INKVIO viop);
- inkapi INKReturnCode INKVIONBytesSet(INKVIO viop, int nbytes);
- inkapi int INKVIONDoneGet(INKVIO viop);
- inkapi INKReturnCode INKVIONDoneSet(INKVIO viop, int ndone);
- inkapi int INKVIONTodoGet(INKVIO viop);
+ inkapi int64 INKVIONBytesGet(INKVIO viop);
+ inkapi INKReturnCode INKVIONBytesSet(INKVIO viop, int64 nbytes);
+ inkapi int64 INKVIONDoneGet(INKVIO viop);
+ inkapi INKReturnCode INKVIONDoneSet(INKVIO viop, int64 ndone);
+ inkapi int64 INKVIONTodoGet(INKVIO viop);
inkapi INKMutex INKVIOMutexGet(INKVIO viop);
inkapi INKCont INKVIOContGet(INKVIO viop);
inkapi INKVConn INKVIOVConnGet(INKVIO viop);
@@ -2314,7 +2315,7 @@ extern "C"
provided INKIOBuffer.
*/
- inkapi INKReturnCode INKIOBufferWaterMarkGet(INKIOBuffer bufp, int *water_mark);
+ inkapi INKReturnCode INKIOBufferWaterMarkGet(INKIOBuffer bufp, int64 *water_mark);
/**
The watermark of an INKIOBuffer is the minimum number of bytes
@@ -2330,11 +2331,11 @@ extern "C"
@param water_mark watermark setting, as a number of bytes.
*/
- inkapi INKReturnCode INKIOBufferWaterMarkSet(INKIOBuffer bufp, int water_mark);
+ inkapi INKReturnCode INKIOBufferWaterMarkSet(INKIOBuffer bufp, int64 water_mark);
inkapi INKReturnCode INKIOBufferDestroy(INKIOBuffer bufp);
inkapi INKIOBufferBlock INKIOBufferStart(INKIOBuffer bufp);
- inkapi int INKIOBufferCopy(INKIOBuffer bufp, INKIOBufferReader readerp, int length, int offset);
+ inkapi int64 INKIOBufferCopy(INKIOBuffer bufp, INKIOBufferReader readerp, int64 length, int64 offset);
/**
Writes length bytes of data contained in the string buf to the
@@ -2348,21 +2349,21 @@ extern "C"
in bytes.
*/
- inkapi int INKIOBufferWrite(INKIOBuffer bufp, const void *buf, int length);
- inkapi INKReturnCode INKIOBufferProduce(INKIOBuffer bufp, int nbytes);
+ inkapi int64 INKIOBufferWrite(INKIOBuffer bufp, const void *buf, int64 length);
+ inkapi INKReturnCode INKIOBufferProduce(INKIOBuffer bufp, int64 nbytes);
inkapi INKIOBufferBlock INKIOBufferBlockNext(INKIOBufferBlock blockp);
- inkapi const char *INKIOBufferBlockReadStart(INKIOBufferBlock blockp, INKIOBufferReader readerp, int *avail);
- inkapi int INKIOBufferBlockReadAvail(INKIOBufferBlock blockp, INKIOBufferReader readerp);
- inkapi char *INKIOBufferBlockWriteStart(INKIOBufferBlock blockp, int *avail);
- inkapi int INKIOBufferBlockWriteAvail(INKIOBufferBlock blockp);
+ inkapi const char *INKIOBufferBlockReadStart(INKIOBufferBlock blockp, INKIOBufferReader readerp, int64 *avail);
+ inkapi int64 INKIOBufferBlockReadAvail(INKIOBufferBlock blockp, INKIOBufferReader readerp);
+ inkapi char *INKIOBufferBlockWriteStart(INKIOBufferBlock blockp, int64 *avail);
+ inkapi int64 INKIOBufferBlockWriteAvail(INKIOBufferBlock blockp);
inkapi INKIOBufferReader INKIOBufferReaderAlloc(INKIOBuffer bufp);
inkapi INKIOBufferReader INKIOBufferReaderClone(INKIOBufferReader readerp);
inkapi INKReturnCode INKIOBufferReaderFree(INKIOBufferReader readerp);
inkapi INKIOBufferBlock INKIOBufferReaderStart(INKIOBufferReader readerp);
- inkapi INKReturnCode INKIOBufferReaderConsume(INKIOBufferReader readerp, int nbytes);
- inkapi int INKIOBufferReaderAvail(INKIOBufferReader readerp);
+ inkapi INKReturnCode INKIOBufferReaderConsume(INKIOBufferReader readerp, int64 nbytes);
+ inkapi int64 INKIOBufferReaderAvail(INKIOBufferReader readerp);
/* --------------------------------------------------------------------------
@@ -2428,7 +2429,7 @@ extern "C"
/** @deprecated */
inkapi INKStat INKStatCreate(const char *the_name, INKStatTypes the_type);
/** @deprecated */
- inkapi INKReturnCode INKStatIntAddTo(INKStat the_stat, INK64 amount);
+ inkapi INKReturnCode INKStatIntAddTo(INKStat the_stat, int64 amount);
/** @deprecated */
inkapi INKReturnCode INKStatFloatAddTo(INKStat the_stat, float amount);
/** @deprecated */
@@ -2436,17 +2437,17 @@ extern "C"
/** @deprecated */
inkapi INKReturnCode INKStatIncrement(INKStat the_stat);
/** @deprecated */
- inkapi INKReturnCode INKStatIntGet(INKStat the_stat, INK64 * value);
+ inkapi INKReturnCode INKStatIntGet(INKStat the_stat, int64 * value);
/** @deprecated */
inkapi INKReturnCode INKStatFloatGet(INKStat the_stat, float *value);
/** @deprecated */
- inkapi INKReturnCode INKStatIntSet(INKStat the_stat, INK64 value);
+ inkapi INKReturnCode INKStatIntSet(INKStat the_stat, int64 value);
/** @deprecated */
inkapi INKReturnCode INKStatFloatSet(INKStat the_stat, float value);
/** These were removed with the old version of TS */
/** @deprecated */
- inkapi INK_DEPRECATED INK64 INKStatIntRead(INKStat the_stat);
+ inkapi INK_DEPRECATED int64 INKStatIntRead(INKStat the_stat);
/** @deprecated */
inkapi INK_DEPRECATED float INKStatFloatRead(INKStat the_stat);
@@ -2631,7 +2632,7 @@ extern "C"
@return INK_SUCCESS or INK_ERROR.
*/
- inkapi INKReturnCode INKAIORead(int fd, INKU64 offset, char* buf, INKU64 buffSize, INKCont contp);
+ inkapi INKReturnCode INKAIORead(int fd, off_t offset, char* buf, size_t buffSize, INKCont contp);
/**
Async disk IO buffer get
@@ -2652,7 +2653,7 @@ extern "C"
@return INK_SUCCESS or INK_ERROR.
*/
- inkapi INKReturnCode INKAIOWrite(int fd, INKU64 offset, char* buf, const INKU64 bufSize, INKCont contp);
+ inkapi INKReturnCode INKAIOWrite(int fd, off_t offset, char* buf, size_t bufSize, INKCont contp);
/**
Async disk IO set number of threads
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts_private.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts_private.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts_private.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts_private.h Fri Oct 29 22:11:12 2010
@@ -58,11 +58,11 @@ extern "C"
/* api functions to access stats */
/* ClientResp APIs exist as well and are exposed in PrivateFrozen */
inkapi int INKHttpTxnClientReqHdrBytesGet(INKHttpTxn txnp, int *bytes);
- inkapi int INKHttpTxnClientReqBodyBytesGet(INKHttpTxn txnp, int *bytes);
+ inkapi int INKHttpTxnClientReqBodyBytesGet(INKHttpTxn txnp, int64 *bytes);
inkapi int INKHttpTxnServerReqHdrBytesGet(INKHttpTxn txnp, int *bytes);
- inkapi int INKHttpTxnServerReqBodyBytesGet(INKHttpTxn txnp, int *bytes);
+ inkapi int INKHttpTxnServerReqBodyBytesGet(INKHttpTxn txnp, int64 *bytes);
inkapi int INKHttpTxnPushedRespHdrBytesGet(INKHttpTxn txnp, int *bytes);
- inkapi int INKHttpTxnPushedRespBodyBytesGet(INKHttpTxn txnp, int *bytes);
+ inkapi int INKHttpTxnPushedRespBodyBytesGet(INKHttpTxn txnp, int64 *bytes);
/* used in internal sample plugin_as_origin */
inkapi int INKHttpTxnNextHopPortGet(INKHttpTxn txnp);
@@ -89,7 +89,7 @@ extern "C"
inkapi void INKVConnCacheHttpInfoSet(INKVConn connp, INKCacheHttpInfo infop);
/* NetVC API. Experimental, developed for RAFT. No longer used. */
- inkapi void INKVConnInactivityTimeoutSet(INKVConn connp, int timeout);
+ inkapi void INKVConnInactivityTimeoutSet(INKVConn connp, TSHRTime timeout);
inkapi void INKVConnInactivityTimeoutCancel(INKVConn connp);
/* ICP freshness functions */
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h?rev=1028930&r1=1028929&r2=1028930&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h Fri Oct 29 22:11:12 2010
@@ -59,7 +59,7 @@ extern "C"
/****************************************************************************
* Allow to set the body of a POST request.
****************************************************************************/
- inkapi void INKHttpTxnServerRequestBodySet(INKHttpTxn txnp, char *buf, int buflength);
+ inkapi void INKHttpTxnServerRequestBodySet(INKHttpTxn txnp, char *buf, int64 buflength);
/* ===== High Resolution Time ===== */
#define INK_HRTIME_FOREVER HRTIME_FOREVER
@@ -95,30 +95,19 @@ extern "C"
#define INK_HRTIME_NSECONDS(_x) HRTIME_NSECONDS(_x)
/* ===== Time ===== */
- inkapi unsigned int INKBasedTimeGet();
- inkapi double INKBasedTimeGetD();
+ inkapi TSHRTime INKBasedTimeGet();
/****************************************************************************
* Get time when Http TXN started
****************************************************************************/
- inkapi int INKHttpTxnStartTimeGet(INKHttpTxn txnp, INK64 * start_time);
+ inkapi int INKHttpTxnStartTimeGet(INKHttpTxn txnp, TSHRTime * start_time);
/****************************************************************************
* Get time when Http TXN ended
****************************************************************************/
- inkapi int INKHttpTxnEndTimeGet(INKHttpTxn txnp, INK64 * end_time);
+ inkapi int INKHttpTxnEndTimeGet(INKHttpTxn txnp, TSHRTime * end_time);
-/****************************************************************************
- * Get time when Http TXN started
- ****************************************************************************/
- inkapi int INKHttpTxnStartTimeGetD(INKHttpTxn txnp, double *start_time);
-
-/****************************************************************************
- * Get time when Http TXN ended
- ****************************************************************************/
- inkapi int INKHttpTxnEndTimeGetD(INKHttpTxn txnp, double *end_time);
-
- inkapi int INKHttpTxnCachedRespTimeGet(INKHttpTxn txnp, long *resp_time);
+ inkapi int INKHttpTxnCachedRespTimeGet(INKHttpTxn txnp, time_t *resp_time);
/* ===== Cache ===== */
inkapi INKReturnCode INKCacheKeyDataTypeSet(INKCacheKey key, INKCacheDataType type);
@@ -140,7 +129,7 @@ extern "C"
/****************************************************************************
* Return Hi-resolution current time. (int64)
****************************************************************************/
- inkapi INK64 INKhrtime(void);
+ inkapi TSHRTime INKhrtime(void);
/* ===== global http stats ===== */
/****************************************************************************
@@ -177,7 +166,7 @@ extern "C"
/****************************************************************************
* Get size of response body
****************************************************************************/
- inkapi int INKHttpTxnServerRespBodyBytesGet(INKHttpTxn txnp, int *bytes);
+ inkapi int INKHttpTxnServerRespBodyBytesGet(INKHttpTxn txnp, int64 *bytes);
/* ===== CacheHttpInfo ===== */
@@ -255,7 +244,7 @@ extern "C"
* ??
* Return ??
****************************************************************************/
- inkapi int INKHttpTxnClientRespBodyBytesGet(INKHttpTxn txnp, int *bytes);
+ inkapi int INKHttpTxnClientRespBodyBytesGet(INKHttpTxn txnp, int64 *bytes);
/* ===== Matcher Utils ===== */
@@ -278,7 +267,7 @@ extern "C"
* ??
* Return
****************************************************************************/
- inkapi char *INKMatcherExtractIPRange(char *match_str, INKU32 * addr1, INKU32 * addr2);
+ inkapi char *INKMatcherExtractIPRange(char *match_str, uint32 * addr1, uint32 * addr2);
/****************************************************************************
* ??
@@ -335,8 +324,8 @@ extern "C"
* Return
****************************************************************************/
- inkapi void INKIPLookupNewEntry(INKIPLookup iplu, INKU32 addr1, INKU32 addr2, void *data);
- inkapi int INKIPLookupMatchFirst(INKIPLookup iplu, INKU32 addr, INKIPLookupState iplus, void **data);
+ inkapi void INKIPLookupNewEntry(INKIPLookup iplu, uint32 addr1, uint32 addr2, void *data);
+ inkapi int INKIPLookupMatchFirst(INKIPLookup iplu, uint32 addr, INKIPLookupState iplus, void **data);
inkapi int INKIPLookupMatchNext(INKIPLookup iplu, INKIPLookupState iplus, void **data);
/* ===== Configuration Setting ===== */
@@ -450,8 +439,7 @@ extern "C"
* Return != 0 Failure *
* contact: OXY, DY
****************************************************************************/
- inkapi int
- INKAddClusterStatusFunction(INKClusterStatusFunction Status_Function, INKMutex m, INKClusterStatusHandle_t * h);
+ inkapi int INKAddClusterStatusFunction(INKClusterStatusFunction Status_Function, INKMutex m, INKClusterStatusHandle_t * h);
/****************************************************************************
* Cancel subscription to node up/down status notification. *
* Return == 0 Success *
@@ -487,8 +475,7 @@ extern "C"
* Return != 0 Failure *
* contact: OXY, DY
****************************************************************************/
- inkapi int
- INKAddClusterRPCFunction(INKClusterRPCKey_t k, INKClusterRPCFunction RPC_Function, INKClusterRPCHandle_t * h);
+ inkapi int INKAddClusterRPCFunction(INKClusterRPCKey_t k, INKClusterRPCFunction RPC_Function, INKClusterRPCHandle_t * h);
/****************************************************************************
* Delete the key to function association created via *
@@ -549,36 +536,6 @@ extern "C"
****************************************************************************/
inkapi int INKUserNameCacheDelete(INKCont contp, unsigned long ip);
-#define INK_EVENT_POLICY_LOOKUP INK_EVENT_INTERNAL_1200
-
-/****************************************************************************
- * ??
- * Return
- * contact: AAA
- ****************************************************************************/
- inkapi INKReturnCode INKUserPolicyLookup(INKHttpTxn txnp, void **user_info);
-
-/****************************************************************************
- * ??
- * Return ??
- * contact: AAA
- ****************************************************************************/
- inkapi INKReturnCode INKHttpTxnBillable(INKHttpTxn txnp, int bill, const char *eventName);
-
-/****************************************************************************
- * ??
- * Return ??
- * contact: AAA
- ****************************************************************************/
- inkapi void INKPolicyContSet(INKCont p);
-
-/****************************************************************************
- * ??
- * Return ??
- * contact: AAA
- ****************************************************************************/
- inkapi INKReturnCode INKUserPolicyFetch(INKU32 ip, char *name);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */