Changeset 1078:74bba7975864 in freeDiameter for libfdcore/p_psm.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_psm.c (modified) (11 diffs)

libfdcore/p_psm.c

@@ -241 +241 @@
                         case FDEVP_CNX_INCOMING: {
                                 struct cnx_incoming * evd = ev->data;
-                                fd_msg_log( FD_MSG_LOG_DROPPED, evd->cer, "Message discarded while cleaning peer state machine queue." );
+                                //fd_msg_log( FD_MSG_LOG_DROPPED, evd->cer, "Message discarded while cleaning peer state machine queue." );
                                 CHECK_FCT_DO( fd_msg_free(evd->cer), /* continue */);
                                 fd_cnx_destroy(evd->cnx);
@@ -489 +489 @@
                 struct msg * msg = NULL;
                 struct msg_hdr * hdr;
-                struct timespec rcvon;
-                
-                /* Retrieve the piggytailed timestamp */
-                memcpy(&rcvon, ev_data+ev_sz, sizeof(struct timespec));
                 
                 /* Parse the received buffer */
@@ -503 +499 @@
                         } );
                         
-                CHECK_FCT_DO( fd_msg_ts_set_recv(msg, &rcvon), /* ... */ );
-                
                 /* If the current state does not allow receiving messages, just drop it */
                 if (cur_state == STATE_CLOSED) {
                         /* In such case, just discard the message */
-                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Purged from peer '%s''s queue (CLOSED state).", peer->p_hdr.info.pi_diamid );
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Purged from peer '%s''s queue (CLOSED state).", peer->p_hdr.info.pi_diamid );
                         fd_msg_free(msg);
                         goto psm_loop;
@@ -514 +508 @@
                 
                 /* Log incoming message */
-                fd_msg_log( FD_MSG_LOG_RECEIVED, msg, "Received %zdb from '%s' (%s)", ev_sz, peer->p_hdr.info.pi_diamid, STATE_STR(cur_state) );
+                //fd_msg_log( FD_MSG_LOG_RECEIVED, msg, "Received %zdb from '%s' (%s)", ev_sz, peer->p_hdr.info.pi_diamid, STATE_STR(cur_state) );
         
                 /* Extract the header */
@@ -525 +519 @@
                         CHECK_FCT_DO( fd_p_sr_fetch(&peer->p_sr, hdr->msg_hbhid, &req), goto psm_end );
                         if (req == NULL) {
-                                fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Answer received with no corresponding sent request." );
+                                //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Answer received with no corresponding sent request." );
                                 fd_msg_free(msg);
                                 goto psm_loop;
@@ -535 +529 @@
                         /* Display the delay to receive the answer */
                         {
-                                struct timespec reqsent, delay;
-                                (void) fd_msg_ts_get_sent(req, &reqsent);
-                                TS_DIFFERENCE( &delay, &reqsent, &rcvon );
-                                fd_msg_log( FD_MSG_LOG_TIMING, msg, "Answer received in %ld.%6.6ld sec.", (long)delay.tv_sec, delay.tv_nsec / 1000 );
+                                //fd_msg_log( FD_MSG_LOG_TIMING, msg, "Answer received in %ld.%6.6ld sec.", (long)delay.tv_sec, delay.tv_nsec / 1000 );
                         }
                 } else {
@@ -586 +577 @@
                                 default:
                                         /* In such case, just discard the message */
-                                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received from peer '%s' while connection was not in state %s.", peer->p_hdr.info.pi_diamid, STATE_STR(cur_state) );
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received from peer '%s' while connection was not in state %s.", peer->p_hdr.info.pi_diamid, STATE_STR(cur_state) );
                                         fd_msg_free(msg);
                         }
@@ -603 +594 @@
                                         if (msg) {
                                                 /* Only if an error occurred & the message was not saved / dumped */
-                                                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) );
                                                 CHECK_FCT_DO( fd_msg_free(msg), goto psm_end);
                                         }
@@ -652 +643 @@
                                 /* Cleanup the message if not done */
                                 if (msg) {
-                                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received un-handled non-routable command from peer '%s'.", peer->p_hdr.info.pi_diamid );
+                                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Received un-handled non-routable command from peer '%s'.", peer->p_hdr.info.pi_diamid );
                                         CHECK_FCT_DO( fd_msg_free(msg), /* continue */);
                                         msg = NULL;
@@ -660 +651 @@
                 /* At this point the message must have been fully handled already */
                 if (msg) {
-                        fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error ('%s'): unhandled message.", peer->p_hdr.info.pi_diamid );
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error ('%s'): unhandled message.", peer->p_hdr.info.pi_diamid );
                         fd_msg_free(msg);
                 }
@@ -746 +737 @@
                 }
                 if (params->cer) {
-                        fd_msg_log( FD_MSG_LOG_DROPPED, params->cer, "Internal error: this CER was not handled as expected." );
+                        //fd_msg_log( FD_MSG_LOG_DROPPED, params->cer, "Internal error: this CER was not handled as expected." );
                         CHECK_FCT_DO( fd_msg_free(params->cer), );
                         params->cer = NULL;