trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/2] git commit: TS-1941 Make the Linux native-AIO option build cleanly
Date Wed, 05 Jun 2013 21:31:56 GMT
Updated Branches:
  refs/heads/master 755ff9f4f -> 1422dd1b6


TS-1941 Make the Linux native-AIO option build cleanly


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f6e9643e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f6e9643e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f6e9643e

Branch: refs/heads/master
Commit: f6e9643e09598c92796ec4c9b4252e2c70e72566
Parents: 755ff9f
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Wed Jun 5 15:30:30 2013 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Wed Jun 5 15:30:30 2013 -0600

----------------------------------------------------------------------
 CHANGES               |    2 ++
 iocore/aio/AIO.cc     |   10 +++++-----
 iocore/cache/Cache.cc |    4 ++--
 proxy/InkAPI.cc       |    1 +
 4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9643e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 740a13a..37d58d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
   Changes with Apache Traffic Server 3.3.4
 
 
+  *) [TS-1941] Make Linux native-AIO build cleanly.
+
   *) [TS-1938] Remove unnecessary thread_id() wrapper in reclaimable freelist.
     Author: Yunkai Zhang <qiushu.zyk@taobao.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9643e/iocore/aio/AIO.cc
----------------------------------------------------------------------
diff --git a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc
index 7ddcac7..1cd1500 100644
--- a/iocore/aio/AIO.cc
+++ b/iocore/aio/AIO.cc
@@ -543,7 +543,7 @@ aio_thread_main(void *arg)
 }
 #else
 int
-DiskHandler::startAIOEvent(int event, Event *e) {
+DiskHandler::startAIOEvent(int /* event ATS_UNUSED */, Event *e) {
   SET_HANDLER(&DiskHandler::mainAIOEvent);
   e->schedule_every(AIO_PERIOD);
   trigger_event = e;
@@ -597,7 +597,7 @@ Lagain:
 }
 
 int
-ink_aio_read(AIOCallback *op, int fromAPI) {
+ink_aio_read(AIOCallback *op, int /* fromAPI ATS_UNUSED */) {
   op->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
   op->aiocb.aio_lio_opcode = IO_CMD_PREAD;
   op->aiocb.data = op;
@@ -607,7 +607,7 @@ ink_aio_read(AIOCallback *op, int fromAPI) {
 }
 
 int
-ink_aio_write(AIOCallback *op, int fromAPI) {
+ink_aio_write(AIOCallback *op, int /* fromAPI ATS_UNUSED */) {
   op->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
   op->aiocb.aio_lio_opcode = IO_CMD_PWRITE;
   op->aiocb.data = op;
@@ -617,7 +617,7 @@ ink_aio_write(AIOCallback *op, int fromAPI) {
 }
 
 int
-ink_aio_readv(AIOCallback *op, int fromAPI) {
+ink_aio_readv(AIOCallback *op, int /* fromAPI ATS_UNUSED */) {
   DiskHandler *dh = this_ethread()->diskHandler;
   AIOCallback *io = op;
   int sz = 0;
@@ -644,7 +644,7 @@ ink_aio_readv(AIOCallback *op, int fromAPI) {
 }
 
 int
-ink_aio_writev(AIOCallback *op, int fromAPI) {
+ink_aio_writev(AIOCallback *op, int /* fromAPI ATS_UNUSED */) {
   DiskHandler *dh = this_ethread()->diskHandler;
   AIOCallback *io = op;
   int sz = 0;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9643e/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 6d8fd2d..f577730 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -158,7 +158,7 @@ struct VolInit : public Continuation
   int64_t offset;
   bool vol_clear;
 
-  int mainEvent(int event, Event *e) {
+  int mainEvent(int /* event ATS_UNUSED */, Event */* e ATS_UNUSED */) {
     vol->init(path, blocks, offset, vol_clear);
     mutex.clear();
     delete this;
@@ -181,7 +181,7 @@ struct DiskInit : public Continuation
   int fildes;
   bool clear;
 
-  int mainEvent(int event, Event *e) {
+  int mainEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */) {
     disk->open(s, blocks, askip, ahw_sector_size, fildes, clear);
     mutex.clear();
     delete this;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f6e9643e/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index a15b505..8004a1e 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -7316,6 +7316,7 @@ TSReturnCode
 TSAIOThreadNumSet(int thread_num)
 {
 #if AIO_MODE == AIO_MODE_NATIVE
+  (void)thread_num;
   return TS_SUCCESS;
 #else
   if (ink_aio_thread_num_set(thread_num))


Mime
View raw message