freeDiameter: libfdcore/p

annotate libfdcore/p_out.c @ 1010:357c2f892d24

Implement a new counter on pending answers to send back to a peer. Function fd_peer_get_load_pending updated to retrieve this counter as well. When a peer has answers pending, the connection is not immediately teared down upon DPR/DPA exchange, but a GRACE_TIMEOUT delay (default 1 sec) is granted.

author	Sebastien Decugis <sdecugis@freediameter.net>
date	Mon, 25 Mar 2013 16:39:32 +0100
parents	5c564966a754
children	0117a7746b21

rev	line source
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	1 /*********************************************************************************************************
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	2 * Software License Agreement (BSD License) *
740 4a9f08d6b6ba Updated my mail address Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	3 * Author: Sebastien Decugis <sdecugis@freediameter.net> *
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	4 * *
931 155d45d06530 Updated copyright information Sebastien Decugis <sdecugis@freediameter.net> parents: 928 diff changeset	5 * Copyright (c) 2013, WIDE Project and NICT *
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	6 * All rights reserved. *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	7 * *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	8 * Redistribution and use of this software in source and binary forms, with or without modification, are *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	9 * permitted provided that the following conditions are met: *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	10 * *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	11 * * Redistributions of source code must retain the above *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	12 * copyright notice, this list of conditions and the *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	13 * following disclaimer. *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	14 * *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	15 * * Redistributions in binary form must reproduce the above *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	16 * copyright notice, this list of conditions and the *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	17 * following disclaimer in the documentation and/or other *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	18 * materials provided with the distribution. *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	19 * *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	20 * * Neither the name of the WIDE Project or NICT nor the *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	21 * names of its contributors may be used to endorse or *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	22 * promote products derived from this software without *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	23 * specific prior written permission of WIDE Project and *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	24 * NICT. *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	25 * *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	26 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	27 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	28 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	29 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	30 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	32 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	34 *********************************************************************************************************/
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	35
658 f198d16fa7f4 Initial commit for 1.1.0: Sebastien Decugis <sdecugis@nict.go.jp> parents: 455 diff changeset	36 #include "fdcore-internal.h"
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	37
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	38 /* Alloc a new hbh for requests, bufferize the message and send on the connection, save in sentreq if provided */
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	39 static int do_send(struct msg ** msg, uint32_t flags, struct cnxctx * cnx, uint32_t * hbh, struct sr_list * srl)
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	40 {
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	41 struct msg_hdr * hdr;
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	42 int msg_is_a_req;
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	43 uint8_t * buf;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	44 size_t sz;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	45 int ret;
165 4679ff581d6a Fix invalid restore of the hop-by-hop id on forwarded answers Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	46 uint32_t bkp_hbh = 0;
895 fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	47 struct timespec senton;
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	48 struct msg * cpy_for_logs_only;
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	49
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	50 TRACE_ENTRY("%p %x %p %p %p", msg, flags, cnx, hbh, srl);
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	51
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	52 /* Retrieve the message header */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	53 CHECK_FCT( fd_msg_hdr(*msg, &hdr) );
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	54
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	55 msg_is_a_req = (hdr->msg_flags & CMD_FLAG_REQUEST);
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	56 if (msg_is_a_req) {
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	57 CHECK_PARAMS(hbh && srl);
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	58 /* Alloc the hop-by-hop id and increment the value for next message */
165 4679ff581d6a Fix invalid restore of the hop-by-hop id on forwarded answers Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	59 bkp_hbh = hdr->msg_hbhid;
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	60 hdr->msg_hbhid = *hbh;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	61 *hbh = hdr->msg_hbhid + 1;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	62 }
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	63
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	64 /* Create the message buffer */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	65 CHECK_FCT(fd_msg_bufferize( *msg, &buf, &sz ));
72 57ffd98dbe96 Fix race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 61 diff changeset	66 pthread_cleanup_push( free, buf );
57ffd98dbe96 Fix race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 61 diff changeset	67
895 fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	68 cpy_for_logs_only = *msg;
688 8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	69
72 57ffd98dbe96 Fix race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 61 diff changeset	70 /* Save a request before sending so that there is no race condition with the answer */
57ffd98dbe96 Fix race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 61 diff changeset	71 if (msg_is_a_req) {
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	72 CHECK_FCT_DO( ret = fd_p_sr_store(srl, msg, &hdr->msg_hbhid, bkp_hbh), goto out );
72 57ffd98dbe96 Fix race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 61 diff changeset	73 }
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	74
895 fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	75 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &senton), /* ... */ );
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	76 CHECK_FCT_DO( fd_msg_ts_set_sent(cpy_for_logs_only, &senton), /* ... */ );
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	77
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	78 /* Log the message */
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	79 fd_msg_log( FD_MSG_LOG_SENT, cpy_for_logs_only, "Sent to '%s'", fd_cnx_getid(cnx));
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	80
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	81 {
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	82 struct timespec rcvon, delay;
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	83
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	84 (void) fd_msg_ts_get_recv(cpy_for_logs_only, &rcvon);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	85 if (rcvon.tv_sec != 0 \|\| rcvon.tv_nsec != 0) {
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	86 TS_DIFFERENCE( &delay, &rcvon, &senton);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	87 fd_msg_log( FD_MSG_LOG_TIMING, cpy_for_logs_only, "Forwarded in %d.%06.6d sec", delay.tv_sec, delay.tv_nsec/1000);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	88 } else { /* We log the answer time only for answers generated locally */
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	89 if (!msg_is_a_req) {
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	90 /* get the matching request */
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	91 struct msg * req;
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	92 struct timespec reqrcvon;
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	93 (void) fd_msg_answ_getq(cpy_for_logs_only, &req);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	94 (void) fd_msg_ts_get_recv(req, &reqrcvon);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	95 TS_DIFFERENCE( &delay, &reqrcvon, &senton);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	96 fd_msg_log( FD_MSG_LOG_TIMING, cpy_for_logs_only, "Answered in %d.%06.6d sec", delay.tv_sec, delay.tv_nsec/1000);
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	97 }
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	98 }
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	99 }
fbf77629cb7b Added received and sent timestamps in the messages; added logs on emission and reception Sebastien Decugis <sdecugis@freediameter.net> parents: 740 diff changeset	100
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	101 /* Send the message */
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	102 CHECK_FCT_DO( ret = fd_cnx_send(cnx, buf, sz, flags), );
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	103 out:
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	104 ;
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	105 pthread_cleanup_pop(1);
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	106
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	107 if (ret)
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	108 return ret;
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 688 diff changeset	109
72 57ffd98dbe96 Fix race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 61 diff changeset	110 /* Free remaining messages (i.e. answers) */
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	111 if (*msg) {
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	112 CHECK_FCT( fd_msg_free(*msg) );
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	113 *msg = NULL;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	114 }
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	115
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	116 return 0;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	117 }
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	118
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	119 static void cleanup_requeue(void * arg)
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	120 {
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	121 struct msg *msg = arg;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	122 CHECK_FCT_DO(fd_fifo_post(fd_g_outgoing, &msg),
688 8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	123 {
8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	124 fd_msg_log( FD_MSG_LOG_DROPPED, msg, "An error occurred while attempting to requeue this message during cancellation of the sending function");
8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	125 CHECK_FCT_DO(fd_msg_free(msg), /* What can we do more? */);
8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	126 } );
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	127 }
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	128
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	129 /* The code of the "out" thread */
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	130 static void * out_thr(void * arg)
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	131 {
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	132 struct fd_peer * peer = arg;
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	133 ASSERT( CHECK_PEER(peer) );
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	134
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	135 /* Set the thread name */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	136 {
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	137 char buf[48];
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	138 snprintf(buf, sizeof(buf), "OUT/%s", peer->p_hdr.info.pi_diamid);
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	139 fd_log_threadname ( buf );
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	140 }
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	141
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	142 /* Loop until cancelation */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	143 while (1) {
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	144 struct msg * msg;
688 8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	145 int ret;
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	146
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	147 /* Retrieve next message to send */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	148 CHECK_FCT_DO( fd_fifo_get(peer->p_tosend, &msg), goto error );
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	149
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	150 /* Now if we are cancelled, we requeue this message */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	151 pthread_cleanup_push(cleanup_requeue, msg);
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	152
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	153 /* Send the message, log any error */
688 8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	154 CHECK_FCT_DO( ret = do_send(&msg, 0, peer->p_cnxctx, &peer->p_hbh, &peer->p_sr),
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	155 {
455 7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	156 if (msg) {
975 5c564966a754 Remove \n from fd_msg_log. Thomas Klausner <tk@giga.or.at> parents: 931 diff changeset	157 fd_msg_log( FD_MSG_LOG_DROPPED, msg, "Internal error: Problem while sending (%s)", strerror(ret) );
455 7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	158 fd_msg_free(msg);
7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	159 }
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	160 } );
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	161
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	162 /* Loop */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	163 pthread_cleanup_pop(0);
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	164 }
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	165
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	166 error:
34 0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	167 /* It is not really a connection error, but the effect is the same, we are not able to send anymore message */
0e2b57789361 Backup for the WE, some warnings remaining Sebastien Decugis <sdecugis@nict.go.jp> parents: 33 diff changeset	168 CHECK_FCT_DO( fd_event_send(peer->p_events, FDEVP_CNX_ERROR, 0, NULL), /* What do we do if it fails? */ );
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	169 return NULL;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	170 }
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	171
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	172 /* Wrapper to sending a message either by out thread (peer in OPEN state) or directly; cnx or peer must be provided. Flags are valid only for direct sending, not through thread (unused) */
965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	173 int fd_out_send(struct msg ** msg, struct cnxctx * cnx, struct fd_peer * peer, uint32_t flags)
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	174 {
1010 357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	175 struct msg_hdr * hdr;
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	176
229 965f5971dc23 Broadcast CEA over all streams to avoid possible race condition Sebastien Decugis <sdecugis@nict.go.jp> parents: 208 diff changeset	177 TRACE_ENTRY("%p %p %p %x", msg, cnx, peer, flags);
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	178 CHECK_PARAMS( msg && *msg && (cnx \|\| (peer && peer->p_cnxctx)));
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	179
1010 357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	180 if (peer) {
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	181 CHECK_FCT( fd_msg_hdr(*msg, &hdr) );
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	182 if (!(hdr->msg_flags & CMD_FLAG_REQUEST)) {
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	183 /* Update the count of pending answers to send */
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	184 CHECK_POSIX( pthread_mutex_lock(&peer->p_state_mtx) );
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	185 peer->p_reqin_count--;
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	186 CHECK_POSIX( pthread_mutex_unlock(&peer->p_state_mtx) );
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	187 }
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	188 }
357c2f892d24 Implement a new counter on pending answers to send back to a peer. Sebastien Decugis <sdecugis@freediameter.net> parents: 975 diff changeset	189
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	190 if (fd_peer_getstate(peer) == STATE_OPEN) {
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	191 /* Normal case: just queue for the out thread to pick it up */
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	192 CHECK_FCT( fd_fifo_post(peer->p_tosend, msg) );
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	193
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	194 } else {
688 8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	195 int ret;
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	196 uint32_t *hbh = NULL;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	197
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	198 /* In other cases, the thread is not running, so we handle the sending directly */
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	199 if (peer)
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	200 hbh = &peer->p_hbh;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	201
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	202 if (!cnx)
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	203 cnx = peer->p_cnxctx;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	204
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	205 /* Do send the message */
688 8c3dc8584dab Prepared capability for messages logging to separate files / folders Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	206 CHECK_FCT_DO( ret = do_send(msg, flags, cnx, hbh, peer ? &peer->p_sr : NULL),
35 6486e97f56ae Added test for modified message parsing Sebastien Decugis <sdecugis@nict.go.jp> parents: 34 diff changeset	207 {
455 7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	208 if (msg) {
975 5c564966a754 Remove \n from fd_msg_log. Thomas Klausner <tk@giga.or.at> parents: 931 diff changeset	209 fd_msg_log( FD_MSG_LOG_DROPPED, *msg, "Internal error: Problem while sending (%s)", strerror(ret) );
455 7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	210 fd_msg_free(*msg);
7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	211 *msg = NULL;
7250e91f0662 Some additional flush enforcement to attempt to avoid some possible problems Sebastien Decugis <sdecugis@nict.go.jp> parents: 454 diff changeset	212 }
35 6486e97f56ae Added test for modified message parsing Sebastien Decugis <sdecugis@nict.go.jp> parents: 34 diff changeset	213 } );
33 e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	214 }
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	215
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	216 return 0;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	217 }
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	218
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	219 /* Start the "out" thread that picks messages in p_tosend and send them on p_cnxctx */
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	220 int fd_out_start(struct fd_peer * peer)
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	221 {
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	222 TRACE_ENTRY("%p", peer);
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	223 CHECK_PARAMS( CHECK_PEER(peer) && (peer->p_outthr == (pthread_t)NULL) );
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	224
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	225 CHECK_POSIX( pthread_create(&peer->p_outthr, NULL, out_thr, peer) );
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	226
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	227 return 0;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	228 }
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	229
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	230 /* Stop that thread */
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	231 int fd_out_stop(struct fd_peer * peer)
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	232 {
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	233 TRACE_ENTRY("%p", peer);
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	234 CHECK_PARAMS( CHECK_PEER(peer) );
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	235
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	236 CHECK_FCT( fd_thr_term(&peer->p_outthr) );
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	237
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	238 return 0;
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	239 }
e6fcdf12b9a0 Added a lot of TODOs :) Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	240

Mercurial > hg > freeDiameter

annotate libfdcore/p_out.c @ 1010:357c2f892d24