Changeset 710:e60376cb15e8 in freeDiameter

Timestamp:

Feb 10, 2011, 4:00:53 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Minor changes

Files:

• libfdcore/cnxctx.c (modified) (2 diffs)
• libfdcore/sctp.c (modified) (2 diffs)
• libfdproto/fdproto-internal.h (modified) (1 diff)
• libfdproto/messages.c (modified) (1 diff)
• libfdproto/msg_log.c (modified) (4 diffs)

libfdcore/cnxctx.c

@@ -622 +622 @@
 again:
         ret = recv(conn->cc_socket, buffer, length, 0);
-        /* Handle special case of timeout */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        /* Handle special case of timeout / interrupts */
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
+                pthread_testcancel();
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */
@@ -649 +650 @@
         ret = send(conn->cc_socket, buffer, length, 0);
         /* Handle special case of timeout */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
+                pthread_testcancel();
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */

libfdcore/sctp.c

@@ -1041 +1041 @@
         ret = sendmsg(conn->cc_socket, &mhdr, 0);
         /* Handle special case of timeout */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
+                pthread_testcancel();
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */
@@ -1099 +1100 @@
         pthread_cleanup_push(free, data);
         ret = recvmsg(conn->cc_socket, &mhdr, 0);
+        pthread_testcancel();
         pthread_cleanup_pop(0);
         
         /* First, handle timeouts (same as fd_cnx_s_recv) */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */

libfdproto/fdproto-internal.h

@@ -52 +52 @@
 
 /* Special message dump function */
+void fd_msg_dump_fstr_one ( struct msg * msg, FILE * fstr );
 void fd_msg_dump_fstr ( struct msg * msg, FILE * fstr );
 

libfdproto/messages.c

@@ -808 +808 @@
         } while (ref);
 }
+void fd_msg_dump_fstr_one ( struct msg * msg, FILE * fstr ) /* just the header */
+{
+        msg_dump_intern ( NONE, msg, 2, fstr );
+}
 
 /* Dump a message content -- for debug mostly */

libfdproto/msg_log.c

@@ -109 +109 @@
         FILE * fstr;
         
+        char buftime[256];
+        size_t offset = 0;
+        struct timespec ts;
+        struct tm tm;
+        
         TRACE_ENTRY("%d %p %p", cause, msg, prefix_format);
         CHECK_PARAMS_DO( (cause >= 0) && (cause <= FD_MSG_LOG_MAX),
@@ -125 +130 @@
         CHECK_POSIX_DO( pthread_mutex_unlock(&ml_conf.lock), );
         
+        /* Get current time */
+        CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &ts), /* continue */);
+        offset += strftime(buftime + offset, sizeof(buftime) - offset, "%D,%T", localtime_r( &ts.tv_sec , &tm ));
+        offset += snprintf(buftime + offset, sizeof(buftime) - offset, ".%6.6ld", ts.tv_nsec / 1000);
+        
+
         /* Okay, now we will create the file descriptor */
         switch (meth) {
@@ -142 +153 @@
         
         /* For file methods, let's parse the message so it looks better */
-        if ((meth != FD_MSG_LOGTO_DEBUGONLY) && ml_conf.dict) {
+        if (((meth != FD_MSG_LOGTO_DEBUGONLY) || (fd_g_debug_lvl > FULL)) && ml_conf.dict) {
                 CHECK_FCT_DO( fd_msg_parse_dict( msg, ml_conf.dict, NULL ), );
         }
@@ -155 +166 @@
         pthread_cleanup_pop(0);
         (void)pthread_mutex_unlock(&fd_log_lock);
-        fd_log_debug_fstr(fstr, "\n\n");
+        
+        fd_log_debug_fstr(fstr, "\nLogged: %s\n\n", buftime);
         
         /* And now the message itself */
-        fd_msg_dump_fstr(msg, fstr);
+        if ((meth == FD_MSG_LOGTO_DEBUGONLY) && (fd_g_debug_lvl <= INFO)) {
+                /* dump only the header */
+                fd_msg_dump_fstr_one(msg, fstr);
+        } else {
+                /* dump the full content */
+                fd_msg_dump_fstr(msg, fstr);
+        }
         
         /* And finally close the stream if needed */
-        TODO("close?");
+        switch (meth) {
+                case FD_MSG_LOGTO_DEBUGONLY:
+                        break;
+                        
+                case FD_MSG_LOGTO_FILE:
+                        TODO("close?");
+                        break;
+                case FD_MSG_LOGTO_DIR:
+                        TODO("close?");
+                        break;
+        }
 }