trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r953171 - in /trafficserver/traffic/trunk/proxy: Main.cc logging/LogUtils.cc mgmt2/Main.cc mgmt2/cluster/ClusterCom.cc
Date Wed, 09 Jun 2010 21:54:39 GMT
Author: zwoop
Date: Wed Jun  9 21:54:38 2010
New Revision: 953171

URL: http://svn.apache.org/viewvc?rev=953171&view=rev
Log:
TS-388: Solaris 10 (x86) 64-bit patch

Tested: Solaris, Fedora Core 13

Author: Igor Brezac
Review: Leif

Modified:
    trafficserver/traffic/trunk/proxy/Main.cc
    trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
    trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=953171&r1=953170&r2=953171&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Wed Jun  9 21:54:38 2010
@@ -343,7 +343,7 @@ max_out_limit(const char *name, int whic
 
   if (unlim_it) {
     ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
-    if (rl.rlim_cur != RLIM_INFINITY) {
+    if (rl.rlim_cur != (rlim_t)RLIM_INFINITY) {
       rl.rlim_cur = (rl.rlim_max = RLIM_INFINITY);
       ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
     }

Modified: trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogUtils.cc?rev=953171&r1=953170&r2=953171&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogUtils.cc Wed Jun  9 21:54:38 2010
@@ -949,7 +949,7 @@ LogUtils::file_is_writeable(const char *
     if (e < 0) {
       ret_val = -1;
     } else {
-      if (limit_data.rlim_cur != RLIM_INFINITY) {
+      if (limit_data.rlim_cur != (rlim_t)RLIM_INFINITY) {
         if (has_size_limit)
           *has_size_limit = true;
         if (current_size_limit_bytes)

Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=953171&r1=953170&r2=953171&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Wed Jun  9 21:54:38 2010
@@ -404,7 +404,7 @@ max_out_limit(const char *name, int whic
 #if !defined(darwin)
   if (unlim_it) {
     ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
-    if (rl.rlim_cur != RLIM_INFINITY) {
+    if (rl.rlim_cur != (rlim_t)RLIM_INFINITY) {
       rl.rlim_cur = (rl.rlim_max = RLIM_INFINITY);
       ink_release_assert(setrlimit(MAGIC_CAST(which), &rl) >= 0);
     }

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc?rev=953171&r1=953170&r2=953171&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc Wed Jun  9 21:54:38 2010
@@ -2552,7 +2552,7 @@ checkBackDoor(int req_fd, char *message)
 
 #if !defined(_WIN32)
     // XXX: Again multiple code caused by misssing PID_T_FMT
-#if defined(solaris)
+#if defined(solaris) && (!defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64)
     snprintf(reply, sizeof(reply), "\twatched_process_fd: %d  watched_process_pid: %ld\n",
              lmgmt->watched_process_fd, lmgmt->watched_process_pid);
 #else



Mime
View raw message