Changed logging to dlog

[sdk/target/sdbd.git] / src / sockets.c

diff --git a/src/sockets.c b/src/sockets.c
index 12baade..ebc7550 100644 (file)
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -23,7 +23,8 @@
 
 #include "sysdeps.h"
 
-#define  TRACE_TAG  TRACE_SOCKETS
+//#define  TRACE_TAG  TRACE_SOCKETS
+#define LOG_TAG "SDBD_TRACE_SOCKETS"
 #include "log.h"
 
 #include "sdb.h"
@@ -156,7 +157,7 @@ static int local_socket_enqueue(asocket *s, apacket *p)
             continue;
         }
         if((r == 0) || (errno != EAGAIN)) {
-            D( "LS(%d): not ready, errno=%d\n", s->id, errno);
+            E( "LS(%d): not ready, errno=%d\n", s->id, errno);
             s->close(s);
             return 1; /* not ready (error) */
         } else {
@@ -262,7 +263,7 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
 {
     asocket *s = _s;
 
-    D("LS(%d): event_func(fd=%d(==%d), ev=%04x)\n", s->id, s->fd, fd, ev);
+    //D("LS(%d): event_func(fd=%d(==%d), ev=%04x)\n", s->id, s->fd, fd, ev);
 
     /* put the FDE_WRITE processing before the FDE_READ
     ** in order to simplify the code.
@@ -333,8 +334,8 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
 
         while (avail > 0) {
             r = sdb_read(fd, x, avail);
-            D("LS(%d): post sdb_read(fd=%d,...) r=%d (errno=%d) avail=%d\n",
-              s->id, s->fd, r, r < 0 ? errno : 0, avail);
+//            D("LS(%d): post sdb_read(fd=%d,...) r=%d (errno=%d) avail=%d\n",
+//              s->id, s->fd, r, r < 0 ? errno : 0, avail);
             if (r > 0 && r <= avail) {
                 avail -= r;
                 x += r;
@@ -349,8 +350,8 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
             is_eof = 1;
             break;
         }
-        D("LS(%d): fd=%d post avail loop. r=%d is_eof=%d forced_eof=%d\n",
-          s->id, s->fd, r, is_eof, s->fde.force_eof);
+//        D("LS(%d): fd=%d post avail loop. r=%d is_eof=%d forced_eof=%d\n",
+//          s->id, s->fd, r, is_eof, s->fde.force_eof);
 
         //변경된 최대 패킷 크기로 코드 수정
         if ((avail == max_payload) || (s->peer == 0)) {
@@ -358,7 +359,7 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
         } else {
             p->len = max_payload >= avail ? max_payload - avail : 0;
             r = s->peer->enqueue(s->peer, p);
-            D("LS(%d): fd=%d post peer->enqueue(). r=%d\n", s->id, s->fd, r);
+            //D("LS(%d): fd=%d post peer->enqueue(). r=%d\n", s->id, s->fd, r);
 
             if(r < 0) {
                     /* error return means they closed us as a side-effect
@@ -393,7 +394,7 @@ static void local_socket_event_func(int fd, unsigned ev, void *_s)
             ** bytes of readable data.
             */
 //        s->close(s);
-        D("LS(%d): FDE_ERROR (fd=%d)\n", s->id, s->fd);
+        E("LS(%d): FDE_ERROR (fd=%d)\n", s->id, s->fd);
 
         return;
     }
@@ -448,8 +449,8 @@ typedef struct aremotesocket {
 
 static int remote_socket_enqueue(asocket *s, apacket *p)
 {
-    D("entered remote_socket_enqueue RS(%d) WRITE fd=%d peer.fd=%d\n",
-      s->id, s->fd, s->peer->fd);
+//    D("entered remote_socket_enqueue RS(%d) WRITE fd=%d peer.fd=%d\n",
+//      s->id, s->fd, s->peer->fd);
     p->msg.command = A_WRTE;
     p->msg.arg0 = s->peer->id;
     p->msg.arg1 = s->id;
@@ -524,7 +525,7 @@ asocket *create_remote_socket(unsigned id, atransport *t)
 
 void connect_to_remote(asocket *s, const char *destination)
 {
-    D("Connect_to_remote call RS(%d) fd=%d\n", s->id, s->fd);
+    //D("Connect_to_remote call RS(%d) fd=%d\n", s->id, s->fd);
     apacket *p = get_apacket();
     size_t len = strlen(destination) + 1;
 
@@ -532,7 +533,7 @@ void connect_to_remote(asocket *s, const char *destination)
         fatal("destination oversized");
     }
 
-    D("LS(%d): connect('%s')\n", s->id, destination);
+    //D("LS(%d): connect('%s')\n", s->id, destination);
     p->msg.command = A_OPEN;
     p->msg.arg0 = s->id;
     p->msg.data_length = len;
@@ -647,11 +648,11 @@ static int smart_socket_enqueue(asocket *s, apacket *p)
 
     len = unhex(p->data, 4);
     if((len < 1) ||  (len > 1024)) {
-        D("SS(%d): bad size (%d)\n", s->id, len);
+        E("SS(%d): bad size (%d)\n", s->id, len);
         goto fail;
     }
 
-    D("SS(%d): len is %d\n", s->id, len );
+    //D("SS(%d): len is %d\n", s->id, len );
         /* can't do anything until we have the full header */
     if((len + 4) > p->len) {
         D("SS(%d): waiting for %d more bytes\n", s->id, len+4 - p->len);
@@ -660,7 +661,7 @@ static int smart_socket_enqueue(asocket *s, apacket *p)
 
     p->data[len + 4] = 0;
 
-    D("SS(%d): '%s'\n", s->id, (char*) (p->data + 4));
+    //D("SS(%d): '%s'\n", s->id, (char*) (p->data + 4));
 
     if (s->transport == NULL) {
         char* error_string = "unknown failure";