trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r903945 - in /incubator/trafficserver/traffic/branches/dev: librecords/ proxy/mgmt2/ proxy/mgmt2/api2/remote/ proxy/mgmt2/cli/ proxy/mgmt2/web2/
Date Thu, 28 Jan 2010 02:48:23 GMT
Author: georgep
Date: Thu Jan 28 02:48:22 2010
New Revision: 903945

URL: http://svn.apache.org/viewvc?rev=903945&view=rev
Log:
TS-50: This patch 'TS50_tm_tc_patch4.diff' fixes TM and TC. It should be now possible to start
Traffic Server via Traffic Cop and Traffic Manager. i.e. /usr/local/bin/traffic_cop. There
is no support for the FreeBSD in the 'trafficserver' script to 'start/stop' the TS process
stack yet.
Tested: FreeBSD(7.2,8.0),ubuntu(9.04),OSX(10.5),OpenSolaris(osol906,5.11)

Modified:
    incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc

Modified: incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc?rev=903945&r1=903944&r2=903945&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/librecords/RecProcess.cc Thu Jan 28 02:48:22
2010
@@ -152,7 +152,9 @@
   int err;
   if ((err = recv_message_cb(msg, msg_type, cookie)) == REC_ERR_OKAY) {
     if (msg_type == RECG_PULL_ACK) {
+      ink_mutex_acquire(&g_force_req_mutex);
       ink_cond_signal(&g_force_req_cond);
+      ink_mutex_release(&g_force_req_mutex);
     }
   }
   return err;
@@ -331,6 +333,7 @@
   ink_mutex_init(&g_force_req_mutex, NULL);
   if (mode_type == RECM_CLIENT) {
     send_pull_message(RECG_PULL_REQ);
+    ink_mutex_acquire(&g_force_req_mutex);
     ink_cond_wait(&g_force_req_cond, &g_force_req_mutex);
     ink_mutex_release(&g_force_req_mutex);
   }

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc?rev=903945&r1=903944&r2=903945&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/LocalManager.cc Thu Jan 28 02:48:22
2010
@@ -487,7 +487,7 @@
   struct sockaddr_un serv_addr;
 
   snprintf(fpath, sizeof(fpath), "%s/%s", pserver_path, LM_CONNECTION_SERVER);
-#if (HOST_OS == freebsd)
+#if 0 /* (HOST_OS == freebsd) */
   char ulpath[1024];
   strcpy(ulpath, fpath);
   ulpath[strlen(fpath) - 1] = 0;
@@ -506,7 +506,7 @@
   memset(&serv_addr, 0, sizeof(serv_addr));
   serv_addr.sun_family = AF_UNIX;
   ink_strncpy(serv_addr.sun_path, fpath, sizeof(serv_addr.sun_path));
-#if (HOST_OS == darwin)
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
   servlen = sizeof(struct sockaddr_un);
 #else
   servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc?rev=903945&r1=903944&r2=903945&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/ProcessManager.cc Thu Jan 28
02:48:22 2010
@@ -231,7 +231,7 @@
 
   snprintf(message, sizeof(message), "%s/%s", pserver_path, LM_CONNECTION_SERVER);
   ink_strncpy(serv_addr.sun_path, message, sizeof(serv_addr.sun_path));
-#if (HOST_OS == darwin)
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
   servlen = sizeof(sockaddr_un);
 #else
   servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc?rev=903945&r1=903944&r2=903945&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
(original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
Thu Jan 28 02:48:22 2010
@@ -161,7 +161,7 @@
   memset(&client_sock, 0, sizeof(sockaddr_un));
   client_sock.sun_family = AF_UNIX;
   strncpy(client_sock.sun_path, main_socket_path, sizeof(client_sock.sun_path));
-#if (HOST_OS == darwin)
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
   sockaddr_len = sizeof(sockaddr_un);
 #else
   sockaddr_len = sizeof(client_sock.sun_family) + strlen(client_sock.sun_path);
@@ -186,7 +186,7 @@
   memset(&client_event_sock, 0, sizeof(sockaddr_un));
   client_event_sock.sun_family = AF_UNIX;
   strncpy(client_event_sock.sun_path, event_socket_path, sizeof(client_sock.sun_path));
-#if (HOST_OS == darwin)
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
   sockaddr_len = sizeof(sockaddr_un);
 #else
   sockaddr_len = sizeof(client_event_sock.sun_family) + strlen(client_event_sock.sun_path);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc?rev=903945&r1=903944&r2=903945&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/clientCLI.cc Thu Jan 28 02:48:22
2010
@@ -162,7 +162,7 @@
   memset(&clientS, 0, sizeof(sockaddr_un));
   clientS.sun_family = AF_UNIX; // UNIX domain socket
   ink_strncpy(clientS.sun_path, sockPath, sizeof(clientS.sun_path));
-#if (HOST_OS == darwin)
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
   sockaddrLen = sizeof(sockaddr_un);
 #else
   sockaddrLen = sizeof(clientS.sun_family) + strlen(clientS.sun_path);;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc?rev=903945&r1=903944&r2=903945&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebIntrMain.cc Thu Jan 28
02:48:22 2010
@@ -376,7 +376,7 @@
 
   serv_addr.sun_family = AF_UNIX;
   ink_strncpy(serv_addr.sun_path, fpath, sizeof(serv_addr.sun_path));
-#if (HOST_OS == darwin)
+#if (HOST_OS == darwin) || (HOST_OS == freebsd)
   servlen = sizeof(struct sockaddr_un);
 #else
   servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);



Mime
View raw message