Changeset 1078:74bba7975864 in freeDiameter for libfdcore/p_out.c

Timestamp:

Apr 30, 2013, 4:37:57 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Cleanup the timing data and fd_msg_log feature that will be replaced by the new hooks mechanism. Kept the calls to fd_msg_log in comments to find the locations easily. WORK IN PROGRESS.

File:

• libfdcore/p_out.c (modified) (5 diffs)

libfdcore/p_out.c

@@ -45 +45 @@
         int ret;
         uint32_t bkp_hbh = 0;
-        struct timespec senton;
         struct msg * cpy_for_logs_only;
         
@@ -73 +72 @@
         }
         
-        CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &senton), /* ... */ );
-        CHECK_FCT_DO( fd_msg_ts_set_sent(cpy_for_logs_only, &senton), /* ... */ );
-        
         /* Log the message */
-        fd_msg_log( FD_MSG_LOG_SENT, cpy_for_logs_only, "Sent to '%s'", fd_cnx_getid(cnx));
-        
-        {
-                struct timespec rcvon, delay;
-                
-                (void) fd_msg_ts_get_recv(cpy_for_logs_only, &rcvon);
-                if (rcvon.tv_sec != 0 || rcvon.tv_nsec != 0) {
-                        TS_DIFFERENCE( &delay, &rcvon, &senton);
-                        fd_msg_log( FD_MSG_LOG_TIMING, cpy_for_logs_only, "Forwarded in %ld.%6.6ld sec", (long)delay.tv_sec, delay.tv_nsec/1000);
-                } else { /* We log the answer time only for answers generated locally */
-                        if (!msg_is_a_req) {
-                                /* get the matching request */
-                                struct msg * req;
-                                struct timespec reqrcvon;
-                                (void) fd_msg_answ_getq(cpy_for_logs_only, &req);
-                                (void) fd_msg_ts_get_recv(req, &reqrcvon);
-                                TS_DIFFERENCE( &delay, &reqrcvon, &senton);
-                                fd_msg_log( FD_MSG_LOG_TIMING, cpy_for_logs_only, "Answered in %ld.%6.6ld sec", (long)delay.tv_sec, delay.tv_nsec/1000);
-                        }
-                }
-        }
+        // fd_msg_log( FD_MSG_LOG_SENT, cpy_for_logs_only, "Sent to '%s'", fd_cnx_getid(cnx));
         
         /* Send the message */
@@ -122 +98 @@
         CHECK_FCT_DO(fd_fifo_post(fd_g_outgoing, &msg),
                 {
-                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "An error occurred while attempting to requeue this message during cancellation of the sending function");
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "An error occurred while attempting to requeue this message during cancellation of the sending function");
                         CHECK_FCT_DO(fd_msg_free(msg), /* What can we do more? */);
                 } );
@@ -155 +131 @@
                         {
                                 if (msg) {
-                                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: Problem while sending (%s)", strerror(ret) );
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: Problem while sending (%s)", strerror(ret) );
                                         fd_msg_free(msg);
                                 }
@@ -207 +183 @@
                         {
                                 if (msg) {
-                                        fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Problem while sending (%s)", strerror(ret) );
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Problem while sending (%s)", strerror(ret) );
                                         fd_msg_free(*msg);
                                         *msg = NULL;