msgr: uninline tcp_{read,write}

diff --git a/src/msg/tcp.cc b/src/msg/tcp.cc
index 43fd27ab372ff3cc1e888b67c9e7a64b43e3f31e..49780b34551d2c862c3cf0b7cecdf37115381bbc 100644 (file)
--- a/src/msg/tcp.cc
+++ b/src/msg/tcp.cc
@@ -51,6 +51,37 @@ int tcp_write(int sd, char *buf, int len)
 }
 */
 
+int tcp_read(int sd, char *buf, int len) {
+  while (len > 0) {
+    int got = ::recv( sd, buf, len, 0 );
+    if (got <= 0) {
+      //generic_dout(18) << "tcp_read socket " << sd << " closed" << dendl;
+      return -1;
+    }
+    len -= got;
+    buf += got;
+    //generic_dout(DBL) << "tcp_read got " << got << ", " << len << " left" << dendl;
+  }
+  return len;
+}
+
+int tcp_write(int sd, const char *buf, int len) {
+  //generic_dout(DBL) << "tcp_write writing " << len << dendl;
+  assert(len > 0);
+  while (len > 0) {
+    int did = ::send( sd, buf, len, 0 );
+    if (did < 0) {
+      //generic_dout(1) << "tcp_write error did = " << did << "  errno " << errno << " " << strerror(errno) << dendl;
+      //generic_derr(1) << "tcp_write error did = " << did << "  errno " << errno << " " << strerror(errno) << dendl;
+      return did;
+    }
+    len -= did;
+    buf += did;
+    //generic_dout(DBL) << "tcp_write did " << did << ", " << len << " left" << dendl;
+  }
+  return 0;
+}
+
 int tcp_hostlookup(char *str, sockaddr_in& ta)
 {
   char *host = str;

diff --git a/src/msg/tcp.h b/src/msg/tcp.h
index e34795667be336a79599db010ba7a0c4151ea5e1..77a71b56157d470933a8da8b7b73fab66264c1b6 100644 (file)
--- a/src/msg/tcp.h
+++ b/src/msg/tcp.h
@@ -27,36 +27,8 @@ inline ostream& operator<<(ostream& out, const sockaddr_in &ss)
 }
 
 
-inline int tcp_read(int sd, char *buf, int len) {
-  while (len > 0) {
-    int got = ::recv( sd, buf, len, 0 );
-    if (got <= 0) {
-      //generic_dout(18) << "tcp_read socket " << sd << " closed" << dendl;
-      return -1;
-    }
-    len -= got;
-    buf += got;
-    //generic_dout(DBL) << "tcp_read got " << got << ", " << len << " left" << dendl;
-  }
-  return len;
-}
-
-inline int tcp_write(int sd, const char *buf, int len) {
-  //generic_dout(DBL) << "tcp_write writing " << len << dendl;
-  assert(len > 0);
-  while (len > 0) {
-    int did = ::send( sd, buf, len, 0 );
-    if (did < 0) {
-      //generic_dout(1) << "tcp_write error did = " << did << "  errno " << errno << " " << strerror(errno) << dendl;
-      //generic_derr(1) << "tcp_write error did = " << did << "  errno " << errno << " " << strerror(errno) << dendl;
-      return did;
-    }
-    len -= did;
-    buf += did;
-    //generic_dout(DBL) << "tcp_write did " << did << ", " << len << " left" << dendl;
-  }
-  return 0;
-}
+extern int tcp_read(int sd, char *buf, int len);
+extern int tcp_write(int sd, const char *buf, int len);
 
 
 extern int tcp_hostlookup(char *str, sockaddr_in& ta);