From 443677ab1b85a0a4f3faf2039f9befac9c2e9c21 Mon Sep 17 00:00:00 2001 From: hadif Date: Wed, 3 May 2023 00:20:55 +0300 Subject: [PATCH] improved debugs by printing function name --- src/liblsquic/lsquic_bbr.c | 8 +++--- src/liblsquic/lsquic_cubic.c | 12 ++++----- src/liblsquic/lsquic_di_nocopy.c | 2 +- src/liblsquic/lsquic_enc_sess_ietf.c | 8 +++--- src/liblsquic/lsquic_engine.c | 12 ++++----- src/liblsquic/lsquic_ev_log.h | 6 +++-- src/liblsquic/lsquic_frame_reader.c | 6 ++--- src/liblsquic/lsquic_full_conn.c | 12 ++++----- src/liblsquic/lsquic_full_conn_ietf.c | 24 ++++++++--------- src/liblsquic/lsquic_handshake.c | 12 ++++----- src/liblsquic/lsquic_hpi.c | 3 +-- src/liblsquic/lsquic_logger.c | 26 +++++++++--------- src/liblsquic/lsquic_logger.h | 38 ++++++++++++++++----------- src/liblsquic/lsquic_mini_conn.c | 13 +++++---- src/liblsquic/lsquic_mini_conn_ietf.c | 6 ++--- src/liblsquic/lsquic_pacer.c | 8 +++--- src/liblsquic/lsquic_parse_gquic_be.c | 2 +- src/liblsquic/lsquic_qdec_hdl.c | 4 +-- src/liblsquic/lsquic_send_ctl.c | 10 +++---- src/liblsquic/lsquic_spi.c | 18 ++++++------- src/liblsquic/lsquic_stream.c | 16 +++++------ 21 files changed, 125 insertions(+), 121 deletions(-) diff --git a/src/liblsquic/lsquic_bbr.c b/src/liblsquic/lsquic_bbr.c index 5bd83a7fb..1cb23b8b7 100644 --- a/src/liblsquic/lsquic_bbr.c +++ b/src/liblsquic/lsquic_bbr.c @@ -733,8 +733,8 @@ maybe_exit_startup_or_drain (struct lsquic_bbr *bbr, lsquic_time_t now, if (bbr->bbr_mode == BBR_MODE_DRAIN) { target_cwnd = get_target_cwnd(bbr, 1); - LSQ_DEBUG("%s: bytes in flight: %"PRIu64"; target cwnd: %"PRIu64, - __func__, bytes_in_flight, target_cwnd); + LSQ_DEBUG("bytes in flight: %"PRIu64"; target cwnd: %"PRIu64, + bytes_in_flight, target_cwnd); if (bytes_in_flight <= target_cwnd) enter_probe_bw_mode(bbr, now); } @@ -799,9 +799,9 @@ maybe_enter_or_exit_probe_rtt (struct lsquic_bbr *bbr, lsquic_time_t now, if (bbr->bbr_mode == BBR_MODE_PROBE_RTT) { lsquic_bw_sampler_app_limited(&bbr->bbr_bw_sampler); - LSQ_DEBUG("%s: exit probe at: %"PRIu64"; now: %"PRIu64 + LSQ_DEBUG("exit probe at: %"PRIu64"; now: %"PRIu64 "; round start: %d; round passed: %d; rtt: %"PRIu64" usec", - __func__, bbr->bbr_exit_probe_rtt_at, now, is_round_start, + bbr->bbr_exit_probe_rtt_at, now, is_round_start, !!(bbr->bbr_flags & BBR_FLAG_PROBE_RTT_ROUND_PASSED), lsquic_rtt_stats_get_min_rtt(bbr->bbr_rtt_stats)); if (bbr->bbr_exit_probe_rtt_at == 0) diff --git a/src/liblsquic/lsquic_cubic.c b/src/liblsquic/lsquic_cubic.c index a4efeacde..60070e215 100644 --- a/src/liblsquic/lsquic_cubic.c +++ b/src/liblsquic/lsquic_cubic.c @@ -109,7 +109,7 @@ cubic_update (struct lsquic_cubic *cubic, lsquic_time_t now, unsigned n_bytes) void lsquic_cubic_set_flags (struct lsquic_cubic *cubic, enum cubic_flags flags) { - LSQ_DEBUG("%s(cubic, 0x%X)", __func__, flags); + LSQ_DEBUG("(cubic, 0x%X)", flags); cubic->cu_flags = flags; } @@ -132,7 +132,7 @@ lsquic_cubic_init (void *cong_ctl, const struct lsquic_conn_public *conn_pub, else #endif cubic->cu_sampling_rate = 100000; - LSQ_DEBUG("%s(cubic, $conn)", __func__); + LSQ_DEBUG("(cubic, $conn)"); LSQ_INFO("initialized"); } @@ -163,7 +163,7 @@ static void lsquic_cubic_was_quiet (void *cong_ctl, lsquic_time_t now, uint64_t in_flight) { struct lsquic_cubic *const cubic = cong_ctl; - LSQ_DEBUG("%s(cubic, %"PRIu64")", __func__, now); + LSQ_DEBUG("(cubic, %"PRIu64")", now); cubic->cu_epoch_start = 0; } @@ -176,7 +176,7 @@ lsquic_cubic_ack (void *cong_ctl, struct lsquic_packet_out *packet_out, lsquic_time_t rtt; rtt = now_time - packet_out->po_sent; - LSQ_DEBUG("%s(cubic, %"PRIu64", %"PRIu64", %d, %u)", __func__, now_time, rtt, + LSQ_DEBUG("(cubic, %"PRIu64", %"PRIu64", %d, %u)", now_time, rtt, app_limited, n_bytes); if (0 == cubic->cu_min_delay || rtt < cubic->cu_min_delay) { @@ -203,7 +203,7 @@ static void lsquic_cubic_loss (void *cong_ctl) { struct lsquic_cubic *const cubic = cong_ctl; - LSQ_DEBUG("%s(cubic)", __func__); + LSQ_DEBUG("(cubic)"); cubic->cu_epoch_start = 0; if (FAST_CONVERGENCE && cubic->cu_cwnd < cubic->cu_last_max_cwnd) cubic->cu_last_max_cwnd = cubic->cu_cwnd * TWO_MINUS_BETA_OVER_TWO / 1024; @@ -225,7 +225,7 @@ lsquic_cubic_timeout (void *cong_ctl) unsigned long cwnd; cwnd = cubic->cu_cwnd; - LSQ_DEBUG("%s(cubic)", __func__); + LSQ_DEBUG("(cubic)"); cubic_reset(cubic); cubic->cu_ssthresh = cwnd / 2; cubic->cu_tcp_cwnd = 2 * TCP_MSS; diff --git a/src/liblsquic/lsquic_di_nocopy.c b/src/liblsquic/lsquic_di_nocopy.c index dd4794ca4..e0a7459e4 100644 --- a/src/liblsquic/lsquic_di_nocopy.c +++ b/src/liblsquic/lsquic_di_nocopy.c @@ -386,7 +386,7 @@ nocopy_di_insert_frame (struct data_in *data_in, ins_case = insert_frame(ncdi, new_frame, read_offset, &count); ins = ins_case & 0xFF; ins_case >>= 8; - LSQ_DEBUG("%s: ins: %d (case '%c')", __func__, ins, (char) ins_case); + LSQ_DEBUG("ins: %d (case '%c')", ins, (char) ins_case); switch (ins) { case INS_FRAME_OK: diff --git a/src/liblsquic/lsquic_enc_sess_ietf.c b/src/liblsquic/lsquic_enc_sess_ietf.c index 87fc5e12c..bac116804 100644 --- a/src/liblsquic/lsquic_enc_sess_ietf.c +++ b/src/liblsquic/lsquic_enc_sess_ietf.c @@ -1243,7 +1243,7 @@ setup_handshake_keys (struct enc_sess_iquic *enc_sess, const lsquic_cid_t *cid) hp->hp_flags |= 1 << i; else { - LSQ_ERROR("%s: cannot initialize cipher %u", __func__, i); + LSQ_ERROR("cannot initialize cipher %u", i); goto err; } } @@ -1569,7 +1569,7 @@ iquic_ssl_sess_to_resume_info (struct enc_sess_iquic *enc_sess, SSL *ssl, if (!buf) { OPENSSL_free(ticket_buf); - LSQ_INFO("%s: malloc failed", __func__); + LSQ_INFO("malloc failed"); return -1; } @@ -2604,7 +2604,7 @@ iquic_esf_global_init (int flags) } else { - LSQ_LOG1(LSQ_LOG_ERROR, "%s: could not select index", __func__); + LSQ_LOG1(LSQ_LOG_ERROR, "could not select index"); return -1; } } @@ -3625,7 +3625,7 @@ lsquic_ssl_sess_to_resume_info (SSL *ssl, SSL_SESSION *session, status = iquic_ssl_sess_to_resume_info(enc_sess, ssl, session, buf, buf_sz); if (status == 0) { - LSQ_DEBUG("%s called successfully, unset WANT_TICKET flag", __func__); + LSQ_DEBUG("called successfully, unset WANT_TICKET flag"); enc_sess->esi_flags &= ~ESI_WANT_TICKET; lsquic_alarmset_unset(enc_sess->esi_alset, AL_SESS_TICKET); } diff --git a/src/liblsquic/lsquic_engine.c b/src/liblsquic/lsquic_engine.c index a5a217c9c..605dd0c24 100644 --- a/src/liblsquic/lsquic_engine.c +++ b/src/liblsquic/lsquic_engine.c @@ -963,7 +963,7 @@ destroy_conn (struct lsquic_engine *engine, struct lsquic_conn *conn, if (engine->busy.current == conn) { char cidstr[MAX_CID_LEN * 2 + 1]; - lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, + lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, __func__, "busy connection %s is destroyed", (lsquic_cid2str(lsquic_conn_log_cid(conn), cidstr), cidstr)); engine->busy.current = NULL; @@ -1040,7 +1040,7 @@ maybe_grow_conn_heaps (struct lsquic_engine *engine) els = malloc(sizeof(els[0]) * count); if (!els) { - LSQ_ERROR("%s: malloc failed", __func__); + LSQ_ERROR("malloc failed"); return -1; } @@ -1939,7 +1939,7 @@ lsquic_engine_connect (lsquic_engine_t *engine, enum lsquic_version version, if (engine->flags & ENG_SERVER) { - LSQ_ERROR("`%s' must only be called in client mode", __func__); + LSQ_ERROR("must only be called in client mode"); goto err; } @@ -2891,7 +2891,7 @@ send_packets_out (struct lsquic_engine *engine, coi_reheap(&conns_iter, engine); - LSQ_DEBUG("%s: sent %u packet%.*s", __func__, n_sent, n_sent != 1, "s"); + LSQ_DEBUG("sent %u packet%.*s", n_sent, n_sent != 1, "s"); } @@ -3005,7 +3005,7 @@ maybe_log_conn_stats (struct lsquic_engine *engine, struct lsquic_conn *conn, } else { - lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, + lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, __func__, "stop logging status for connection %s: no longer busy", (lsquic_cid2str(lsquic_conn_log_cid(conn), cidstr), cidstr)); engine->busy.current = NULL; @@ -3329,7 +3329,7 @@ update_busy_detector (struct lsquic_engine *engine, struct lsquic_conn *conn, if (MAX_IMMED_TICKS == engine->busy.immed_ticks) { if (engine->busy.current != conn) - lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, + lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, __func__, "connection %s marked busy: it's had %u immediate ticks " "in a row", (lsquic_cid2str(lsquic_conn_log_cid(conn), cidstr), cidstr), diff --git a/src/liblsquic/lsquic_ev_log.h b/src/liblsquic/lsquic_ev_log.h index 5e4a9f4e5..f29d6246f 100644 --- a/src/liblsquic/lsquic_ev_log.h +++ b/src/liblsquic/lsquic_ev_log.h @@ -23,13 +23,15 @@ struct stack_st_X509; /* Log a generic event not tied to any particular connection */ #define EV_LOG_GENERIC_EVENT(...) do { \ if (LSQ_LOG_ENABLED_EXT(LSQ_LOG_DEBUG, LSQLM_EVENT)) \ - lsquic_logger_log1(LSQ_LOG_DEBUG, LSQLM_EVENT, __VA_ARGS__); \ + lsquic_logger_log1(LSQ_LOG_DEBUG, LSQLM_EVENT, \ + __func__, __VA_ARGS__); \ } while (0) /* Log a generic event associated with connection `cid' */ #define EV_LOG_CONN_EVENT(cid, ...) do { \ if (LSQ_LOG_ENABLED_EXT(LSQ_LOG_DEBUG, LSQLM_EVENT)) \ - lsquic_logger_log2(LSQ_LOG_DEBUG, LSQLM_EVENT, cid, __VA_ARGS__); \ + lsquic_logger_log2(LSQ_LOG_DEBUG, LSQLM_EVENT, cid, \ + __func__, __VA_ARGS__); \ } while (0) void diff --git a/src/liblsquic/lsquic_frame_reader.c b/src/liblsquic/lsquic_frame_reader.c index 771f92264..2734f2031 100644 --- a/src/liblsquic/lsquic_frame_reader.c +++ b/src/liblsquic/lsquic_frame_reader.c @@ -230,12 +230,12 @@ lsquic_frame_reader_destroy (struct lsquic_frame_reader *fr) assert(nread <= 0); \ if (0 == nread) \ { \ - LSQ_INFO("%s: unexpected EOF", __func__); \ + LSQ_INFO("unexpected EOF"); \ return -1; \ } \ else \ { \ - LSQ_WARN("%s: error reading from stream: %s", __func__, \ + LSQ_WARN("error reading from stream: %s", \ strerror(errno)); \ return -1; \ } \ @@ -690,7 +690,7 @@ decode_and_pass_payload (struct lsquic_frame_reader *fr) return; stream_error: - LSQ_INFO("%s: stream error %u", __func__, err); + LSQ_INFO("stream error %u", err); if (hset) fr->fr_hsi_if->hsi_discard_header_set(hset); fr->fr_callbacks->frc_on_error(fr->fr_cb_ctx, fr_get_stream_id(fr), err); diff --git a/src/liblsquic/lsquic_full_conn.c b/src/liblsquic/lsquic_full_conn.c index 7c82cd38d..d463510b1 100644 --- a/src/liblsquic/lsquic_full_conn.c +++ b/src/liblsquic/lsquic_full_conn.c @@ -2950,7 +2950,7 @@ create_delayed_streams (struct full_conn *conn) new_streams = malloc(sizeof(new_streams[0]) * avail); if (!new_streams) { - ABORT_WARN("%s: malloc failed", __func__); + ABORT_WARN("malloc failed"); return; } @@ -2963,8 +2963,7 @@ create_delayed_streams (struct full_conn *conn) new_streams[i] = new_stream(conn, generate_stream_id(conn), 0); if (!new_streams[i]) { - ABORT_ERROR("%s: cannot create new stream: %s", __func__, - strerror(errno)); + ABORT_ERROR("cannot create new stream: %s", strerror(errno)); goto cleanup; } } @@ -3261,7 +3260,7 @@ immediate_close (struct full_conn *conn) lsquic_packet_out_avail(packet_out), 0, error_code, error_reason, error_reason ? strlen(error_reason) : 0); if (sz < 0) { - LSQ_WARN("%s failed", __func__); + LSQ_WARN("failed"); return TICK_CLOSE; } lsquic_send_ctl_incr_pack_sz(&conn->fc_send_ctl, packet_out, sz); @@ -4364,8 +4363,7 @@ full_conn_ci_next_tick_time (lsquic_conn_t *lconn, unsigned *why) { now = lsquic_time_now(); if (pacer_time < now) - LSQ_DEBUG("%s: pacer is %"PRIu64" usec in the past", __func__, - now - pacer_time); + LSQ_DEBUG("pacer is %"PRIu64" usec in the past", now - pacer_time); } if (alarm_time && pacer_time) @@ -4499,7 +4497,7 @@ full_conn_ci_log_stats (struct lsquic_conn *lconn) cwnd = conn->fc_send_ctl.sc_ci->cci_get_cwnd( conn->fc_send_ctl.sc_cong_ctl); lsquic_conn_stats_diff(&conn->fc_stats, conn->fc_last_stats, &diff_stats); - lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, + lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, __func__, "%s: ticks: %lu; cwnd: %"PRIu64"; conn flow: max: %"PRIu64 ", avail: %"PRIu64"; packets: sent: %lu, lost: %lu, retx: %lu, rcvd: %lu" "; batch: count: %u; min: %u; max: %u; avg: %.2f", diff --git a/src/liblsquic/lsquic_full_conn_ietf.c b/src/liblsquic/lsquic_full_conn_ietf.c index b682c36e6..2c225c440 100644 --- a/src/liblsquic/lsquic_full_conn_ietf.c +++ b/src/liblsquic/lsquic_full_conn_ietf.c @@ -698,7 +698,7 @@ cid_throt_alarm_expired (enum alarm_id al_id, void *ctx, lsquic_time_t expiry, lsquic_time_t now) { struct ietf_full_conn *const conn = (struct ietf_full_conn *) ctx; - LSQ_DEBUG("%s", __func__); + LSQ_DEBUG("called"); conn->ifc_send_flags |= SF_SEND_NEW_CID; return; } @@ -1798,7 +1798,7 @@ generate_timestamp_frame (struct ietf_full_conn *conn, if (0 != lsquic_packet_out_add_frame(packet_out, conn->ifc_pub.mm, 0, QUIC_FRAME_TIMESTAMP, packet_out->po_data_sz, w)) { - LSQ_DEBUG("%s: adding frame to packet failed: %d", __func__, errno); + LSQ_DEBUG("adding frame to packet failed: %d", errno); return; } packet_out->po_frame_types |= 1 << QUIC_FRAME_TIMESTAMP; @@ -3066,7 +3066,7 @@ retire_seqno (struct ietf_full_conn *conn, unsigned seqno) conn->ifc_send_flags |= SF_SEND_RETIRE_CID; } else - LSQ_INFO("%s: cannot allocate dce", __func__); + LSQ_INFO("cannot allocate dce"); } @@ -3101,7 +3101,7 @@ ietf_full_conn_ci_retire_cid (struct lsquic_conn *lconn) } if (!dces[1]) { - ABORT_WARN("%s: cannot find own DCID", __func__); + ABORT_WARN("cannot find own DCID"); return; } if (!dces[0]) @@ -4326,13 +4326,13 @@ immediate_close (struct ietf_full_conn *conn) conn_err.u.err, error_reason, error_reason ? strlen(error_reason) : 0); if (sz < 0) { - LSQ_WARN("%s failed", __func__); + LSQ_WARN("failed"); return TICK_CLOSE; } if (0 != lsquic_packet_out_add_frame(packet_out, conn->ifc_pub.mm, 0, QUIC_FRAME_CONNECTION_CLOSE, packet_out->po_data_sz, sz)) { - LSQ_WARN("%s: adding frame to packet failed: %d", __func__, errno); + LSQ_WARN("adding frame to packet failed: %d", errno); return TICK_CLOSE; } lsquic_send_ctl_incr_pack_sz(&conn->ifc_send_ctl, packet_out, sz); @@ -4902,8 +4902,7 @@ ietf_full_conn_ci_next_tick_time (struct lsquic_conn *lconn, unsigned *why) { now = lsquic_time_now(); if (pacer_time < now) - LSQ_DEBUG("%s: pacer is %"PRIu64" usec in the past", __func__, - now - pacer_time); + LSQ_DEBUG("pacer is %"PRIu64" usec in the past", now - pacer_time); } if (alarm_time && pacer_time) @@ -7192,15 +7191,14 @@ verify_retry_packet (struct ietf_full_conn *conn, /* Cover the theoretical possibility that we cannot fit the pseudo- * packet and 16-byte decrypted output into 4 KB: */ - LSQ_INFO("%s: Retry packet is too long: %hu bytes", __func__, - packet_in->pi_data_sz); + LSQ_INFO("Retry packet is too long: %hu bytes", packet_in->pi_data_sz); return -1; } pseudo_packet = lsquic_mm_get_4k(conn->ifc_pub.mm); if (!pseudo_packet) { - LSQ_INFO("%s: cannot allocate memory", __func__); + LSQ_INFO("cannot allocate memory"); return -1; } @@ -7344,7 +7342,7 @@ on_dcid_change (struct ietf_full_conn *conn, const lsquic_cid_t *dcid_in) cce->cce_flags |= CCE_USED; lconn->cn_cur_cce_idx = cce - lconn->cn_cces; - LSQ_DEBUGC("%s: set SCID to %"CID_FMT, __func__, CID_BITS(CN_SCID(lconn))); + LSQ_DEBUGC("set SCID to %"CID_FMT, CID_BITS(CN_SCID(lconn))); LOG_SCIDS(conn); return 0; @@ -8989,7 +8987,7 @@ ietf_full_conn_ci_log_stats (struct lsquic_conn *lconn) cwnd = conn->ifc_send_ctl.sc_ci->cci_get_cwnd( conn->ifc_send_ctl.sc_cong_ctl); lsquic_conn_stats_diff(&conn->ifc_stats, conn->ifc_last_stats, &diff_stats); - lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, + lsquic_logger_log1(LSQ_LOG_NOTICE, LSQLM_CONN_STATS, __func__, "%s: ticks: %lu; cwnd: %"PRIu64"; conn flow: max: %"PRIu64 ", avail: %"PRIu64"; packets: sent: %lu, lost: %lu, retx: %lu, rcvd: %lu" "; batch: count: %u; min: %u; max: %u; avg: %.2f", diff --git a/src/liblsquic/lsquic_handshake.c b/src/liblsquic/lsquic_handshake.c index de09e69d8..0d75e886a 100644 --- a/src/liblsquic/lsquic_handshake.c +++ b/src/liblsquic/lsquic_handshake.c @@ -1880,7 +1880,7 @@ get_valid_scfg (const struct lsquic_enc_session *enc_session, temp_scfg->scfg_len = MSG_LEN_VAL(msg_len); - LSQ_DEBUG("%s called, return len %d.", __func__, temp_scfg->scfg_len); + LSQ_DEBUG("called, return len %d.", temp_scfg->scfg_len); // /* TODO: will shi_delete call free to release the buffer? */ // shi->shi_delete(shi_ctx, SERVER_SCFG_KEY, SERVER_SCFG_KEY_SIZE); @@ -2870,8 +2870,7 @@ lsquic_enc_session_handle_chlo_reply (enc_session_t *enc_session_p, end: LSQ_DEBUG("lsquic_enc_session_handle_chlo_reply called, buf in %d, return %d.", len, ret); - EV_LOG_CONN_EVENT(&enc_session->cid, "%s returning %s", __func__, - he2str(ret)); + EV_LOG_CONN_EVENT(&enc_session->cid, "returning %s", he2str(ret)); return ret; } @@ -3226,9 +3225,9 @@ gquic_encrypt_buf (struct lsquic_enc_session *enc_session, EVP_AEAD_CTX *key; if (enc_session) - LSQ_DEBUG("%s: hsk_state: %d", __func__, enc_session->hsk_state); + LSQ_DEBUG("hsk_state: %d", enc_session->hsk_state); else - LSQ_DEBUG("%s: enc_session is not set", __func__); + LSQ_DEBUG("enc_session is not set"); if (!enc_session || enc_session->have_key == 0 || is_chlo) { @@ -3361,8 +3360,7 @@ lsquic_enc_session_handle_chlo(enc_session_t *enc_session_p, } end: - EV_LOG_CONN_EVENT(&enc_session->cid, "%s returning %s", __func__, - he2str(rtt)); + EV_LOG_CONN_EVENT(&enc_session->cid, "returning %s", he2str(rtt)); return rtt; } diff --git a/src/liblsquic/lsquic_hpi.c b/src/liblsquic/lsquic_hpi.c index 5ddd122a0..e5a1ddd23 100644 --- a/src/liblsquic/lsquic_hpi.c +++ b/src/liblsquic/lsquic_hpi.c @@ -327,8 +327,7 @@ lsquic_hpi_next (void *iter_p) stream = next_nonincr(iter, prio); if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG)) - HPI_DEBUG("%s: return stream %"PRIu64", incr: %u, priority %u", - __func__, stream->id, incr, prio); + HPI_DEBUG("return stream %"PRIu64", incr: %u, priority %u", stream->id, incr, prio); return stream; } diff --git a/src/liblsquic/lsquic_logger.c b/src/liblsquic/lsquic_logger.c index 07edb5ab9..070156d33 100644 --- a/src/liblsquic/lsquic_logger.c +++ b/src/liblsquic/lsquic_logger.c @@ -245,7 +245,7 @@ void lsquic_logger_log3 (enum lsq_log_level log_level, enum lsquic_logger_module module, const lsquic_cid_t *conn_id, lsquic_stream_id_t stream_id, - const char *fmt, ...) + const char *caller, const char *fmt, ...) { const int saved_errno = errno; char cidbuf_[MAX_CID_LEN * 2 + 1]; @@ -261,9 +261,9 @@ lsquic_logger_log3 (enum lsq_log_level log_level, goto end; len += lb; } - lb = snprintf(buf + len, max - len, "[%s] [QUIC:%"CID_FMT"-%"PRIu64"] %s: ", + lb = snprintf(buf + len, max - len, "[%s] [QUIC:%"CID_FMT"-%"PRIu64"] %s::%s: ", lsq_loglevel2str[log_level], CID_BITS(conn_id), - stream_id, lsqlm_to_str[module]); + stream_id, lsqlm_to_str[module], caller); if (FORMAT_PROBLEM(lb, len, max)) goto end; len += lb; @@ -292,7 +292,8 @@ lsquic_logger_log3 (enum lsq_log_level log_level, void lsquic_logger_log2 (enum lsq_log_level log_level, enum lsquic_logger_module module, - const struct lsquic_cid *conn_id, const char *fmt, ...) + const struct lsquic_cid *conn_id, const char *caller, + const char *fmt, ...) { const int saved_errno = errno; char cidbuf_[MAX_CID_LEN * 2 + 1]; @@ -309,8 +310,8 @@ lsquic_logger_log2 (enum lsq_log_level log_level, len += lb; } - lb = snprintf(buf + len, max - len, "[%s] [QUIC:%"CID_FMT"] %s: ", - lsq_loglevel2str[log_level], CID_BITS(conn_id), lsqlm_to_str[module]); + lb = snprintf(buf + len, max - len, "[%s] [QUIC:%"CID_FMT"] %s::%s: ", + lsq_loglevel2str[log_level], CID_BITS(conn_id), lsqlm_to_str[module], caller); if (FORMAT_PROBLEM(lb, len, max)) goto end; len += lb; @@ -339,7 +340,7 @@ lsquic_logger_log2 (enum lsq_log_level log_level, void lsquic_logger_log1 (enum lsq_log_level log_level, enum lsquic_logger_module module, - const char *fmt, ...) + const char *caller, const char *fmt, ...) { const int saved_errno = errno; size_t len = 0; @@ -354,8 +355,8 @@ lsquic_logger_log1 (enum lsq_log_level log_level, goto end; len += lb; } - lb = snprintf(buf + len, max - len, "[%s] %s: ", lsq_loglevel2str[log_level], - lsqlm_to_str[module]); + lb = snprintf(buf + len, max - len, "[%s] %s::%s: ", lsq_loglevel2str[log_level], + lsqlm_to_str[module], caller); if (FORMAT_PROBLEM(lb, len, max)) goto end; len += lb; @@ -382,7 +383,8 @@ lsquic_logger_log1 (enum lsq_log_level log_level, void -lsquic_logger_log0 (enum lsq_log_level log_level, const char *fmt, ...) +lsquic_logger_log0 (enum lsq_log_level log_level, const char *caller, + const char *fmt, ...) { const int saved_errno = errno; size_t len = 0; @@ -398,7 +400,7 @@ lsquic_logger_log0 (enum lsq_log_level log_level, const char *fmt, ...) len += lb; } - lb = snprintf(buf + len, max - len, "[%s] ", lsq_loglevel2str[log_level]); + lb = snprintf(buf + len, max - len, "[%s] %s: ", lsq_loglevel2str[log_level], caller); if (FORMAT_PROBLEM(lb, len, max)) goto end; len += lb; @@ -432,7 +434,7 @@ lsquic_logger_init (const struct lsquic_logger_if *lif, void *lctx, logger_ctx = lctx; if (llts < N_LLTS) g_llts = llts; - LSQ_DEBUG("%s called", __func__); + LSQ_DEBUG("called"); } diff --git a/src/liblsquic/lsquic_logger.h b/src/liblsquic/lsquic_logger.h index 2d84eba89..36bc4f81c 100644 --- a/src/liblsquic/lsquic_logger.h +++ b/src/liblsquic/lsquic_logger.h @@ -129,73 +129,81 @@ struct lsquic_cid; void lsquic_logger_log3 (enum lsq_log_level, enum lsquic_logger_module, const struct lsquic_cid *conn_id, - lsquic_stream_id_t stream_id, const char *format, ...) + lsquic_stream_id_t stream_id, const char *caller, + const char *format, ...) #if __GNUC__ - __attribute__((format(printf, 5, 6))) + __attribute__((format(printf, 6, 7))) #endif ; # define LSQ_LOG3(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ lsquic_logger_log3(level, LSQUIC_LOGGER_MODULE, \ - LSQUIC_LOG_CONN_ID, LSQUIC_LOG_STREAM_ID, __VA_ARGS__); \ + LSQUIC_LOG_CONN_ID, LSQUIC_LOG_STREAM_ID, __func__, \ + __VA_ARGS__); \ } while (0) void lsquic_logger_log2 (enum lsq_log_level, enum lsquic_logger_module, - const struct lsquic_cid *conn_id, const char *format, ...) + const struct lsquic_cid *conn_id, const char *caller, + const char *format, ...) #if __GNUC__ - __attribute__((format(printf, 4, 5))) + __attribute__((format(printf, 5, 6))) #endif ; # define LSQ_LOG2(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ lsquic_logger_log2(level, LSQUIC_LOGGER_MODULE, \ - LSQUIC_LOG_CONN_ID, __VA_ARGS__); \ + LSQUIC_LOG_CONN_ID, __func__, \ + __VA_ARGS__); \ } while (0) # define LSQ_LOG2C(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ { \ char cidbuf_[MAX_CID_LEN * 2 + 1]; \ lsquic_logger_log2(level, LSQUIC_LOGGER_MODULE, \ - LSQUIC_LOG_CONN_ID, __VA_ARGS__); \ + LSQUIC_LOG_CONN_ID, __func__, \ + __VA_ARGS__); \ } \ } while (0) void lsquic_logger_log1 (enum lsq_log_level, enum lsquic_logger_module, - const char *format, ...) + const char *caller, const char *format, ...) #if __GNUC__ - __attribute__((format(printf, 3, 4))) + __attribute__((format(printf, 4, 5))) #endif ; # define LSQ_LOG1(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ - lsquic_logger_log1(level, LSQUIC_LOGGER_MODULE, __VA_ARGS__); \ + lsquic_logger_log1(level, LSQUIC_LOGGER_MODULE, \ + __func__, __VA_ARGS__); \ } while (0) # define LSQ_LOG1C(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ { \ char cidbuf_[MAX_CID_LEN * 2 + 1]; \ - lsquic_logger_log1(level, LSQUIC_LOGGER_MODULE, __VA_ARGS__); \ + lsquic_logger_log1(level, LSQUIC_LOGGER_MODULE, \ + __func__, __VA_ARGS__); \ } \ } while (0) void -lsquic_logger_log0 (enum lsq_log_level, const char *format, ...) +lsquic_logger_log0 (enum lsq_log_level, const char *caller, + const char *format, ...) #if __GNUC__ - __attribute__((format(printf, 2, 3))) + __attribute__((format(printf, 3, 4))) #endif ; # define LSQ_LOG0(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ - lsquic_logger_log0(level, __VA_ARGS__); \ + lsquic_logger_log0(level, __func__, __VA_ARGS__); \ } while (0) # define LSQ_LOG0C(level, ...) do { \ if (LSQ_LOG_ENABLED(level)) \ { \ char cidbuf_[MAX_CID_LEN * 2 + 1]; \ - lsquic_logger_log0(level, __VA_ARGS__); \ + lsquic_logger_log0(level, __func__, __VA_ARGS__); \ } \ } while (0) diff --git a/src/liblsquic/lsquic_mini_conn.c b/src/liblsquic/lsquic_mini_conn.c index d7aa161f7..13e329a52 100644 --- a/src/liblsquic/lsquic_mini_conn.c +++ b/src/liblsquic/lsquic_mini_conn.c @@ -1284,8 +1284,7 @@ mini_rechist_largest_recv (void *rechist_ctx) lsquic_time_t delta = mc->mc_largest_recv[0] + (mc->mc_largest_recv[1] << 8) + (mc->mc_largest_recv[2] << 16); - LSQ_DEBUG("%s: largest received: %"PRIu64" usec since creation", - __func__, delta); + LSQ_DEBUG("largest received: %"PRIu64" usec since creation", delta); return mc->mc_created + delta; } @@ -1323,7 +1322,7 @@ mini_rechist_next (void *rechist_ctx) } else rechist->cur_set = 0; - LSQ_DEBUG("%s: return [%"PRIu64", %"PRIu64"]", __func__, + LSQ_DEBUG("return [%"PRIu64", %"PRIu64"]", rechist->range.low, rechist->range.high); return &rechist->range; } @@ -1349,7 +1348,7 @@ least_unacked (const struct mini_conn *mc) packno = lowest_bit_set(unacked) + 1; else packno = highest_bit_set(mc->mc_sent_packnos) + 2; - LSQ_DEBUG("%s: least unacked: %"PRIu64, __func__, packno); + LSQ_DEBUG("least unacked: %"PRIu64, packno); return packno; } @@ -1953,7 +1952,7 @@ mini_conn_ci_packet_sent (struct lsquic_conn *lconn, assert(mc->mc_flags & MC_UNSENT_ACK); mc->mc_flags &= ~MC_UNSENT_ACK; } - LSQ_DEBUG("%s: packet %"PRIu64" sent", __func__, packet_out->po_packno); + LSQ_DEBUG("packet %"PRIu64" sent", packet_out->po_packno); MCHIST_APPEND(mc, MCHE_PACKET_SENT); } @@ -1964,7 +1963,7 @@ mini_conn_ci_packet_not_sent (struct lsquic_conn *lconn, { struct mini_conn *mc = (struct mini_conn *) lconn; packet_out->po_flags &= ~PO_SENT; - LSQ_DEBUG("%s: packet %"PRIu64" not sent", __func__, packet_out->po_packno); + LSQ_DEBUG("packet %"PRIu64" not sent", packet_out->po_packno); MCHIST_APPEND(mc, MCHE_PACKET_DELAYED); } @@ -2057,7 +2056,7 @@ mini_conn_ci_destroy (struct lsquic_conn *lconn) #else if (LSQ_LOG_ENABLED(log_level)) lsquic_logger_log2(log_level, LSQUIC_LOGGER_MODULE, - LSQUIC_LOG_CONN_ID, + LSQUIC_LOG_CONN_ID, __func__, "destroyed. Diagnostics: conn flags: 0x%X, " "mc flags: 0x%X, " #if LSQUIC_RECORD_INORD_HIST diff --git a/src/liblsquic/lsquic_mini_conn_ietf.c b/src/liblsquic/lsquic_mini_conn_ietf.c index 0c6381510..821d52fed 100644 --- a/src/liblsquic/lsquic_mini_conn_ietf.c +++ b/src/liblsquic/lsquic_mini_conn_ietf.c @@ -1788,7 +1788,7 @@ ietf_mini_conn_ci_packet_sent (struct lsquic_conn *lconn, #endif if (packet_out->po_header_type == HETY_HANDSHAKE) conn->imc_flags |= IMC_HSK_PACKET_SENT; - LSQ_DEBUG("%s: packet %"PRIu64" sent", __func__, packet_out->po_packno); + LSQ_DEBUG("packet %"PRIu64" sent", packet_out->po_packno); } @@ -1802,7 +1802,7 @@ ietf_mini_conn_ci_packet_not_sent (struct lsquic_conn *lconn, packet_out->po_flags &= ~PO_SENT; packet_size = lsquic_packet_out_total_sz(lconn, packet_out); conn->imc_bytes_out -= packet_size; - LSQ_DEBUG("%s: packet %"PRIu64" not sent", __func__, packet_out->po_packno); + LSQ_DEBUG("packet %"PRIu64" not sent", packet_out->po_packno); } @@ -1972,7 +1972,7 @@ imico_bitmask_rechist_next (struct ietf_mini_rechist *rechist) } else rechist->u.bitmask.cur_set = 0; - LSQ_DEBUG("%s: return [%"PRIu64", %"PRIu64"]", __func__, + LSQ_DEBUG("return [%"PRIu64", %"PRIu64"]", rechist->u.bitmask.range.low, rechist->u.bitmask.range.high); return &rechist->u.bitmask.range; } diff --git a/src/liblsquic/lsquic_pacer.c b/src/liblsquic/lsquic_pacer.c index 22842c56e..effd7102e 100644 --- a/src/liblsquic/lsquic_pacer.c +++ b/src/liblsquic/lsquic_pacer.c @@ -59,7 +59,7 @@ lsquic_pacer_packet_scheduled (struct pacer *pacer, unsigned n_in_flight, if (n_in_flight == 0 && !in_recovery) { pacer->pa_burst_tokens = 10; - LSQ_DEBUG("%s: replenish tokens: %u", __func__, pacer->pa_burst_tokens); + LSQ_DEBUG("replenish tokens: %u", pacer->pa_burst_tokens); } if (pacer->pa_burst_tokens > 0) @@ -68,7 +68,7 @@ lsquic_pacer_packet_scheduled (struct pacer *pacer, unsigned n_in_flight, pacer->pa_flags &= ~PA_LAST_SCHED_DELAYED; pacer->pa_next_sched = 0; pacer->pa_last_delayed = 0; - LSQ_DEBUG("%s: tokens: %u", __func__, pacer->pa_burst_tokens); + LSQ_DEBUG("tokens: %u", pacer->pa_burst_tokens); return; } @@ -101,7 +101,7 @@ void lsquic_pacer_loss_event (struct pacer *pacer) { pacer->pa_burst_tokens = 0; - LSQ_DEBUG("%s: tokens: %u", __func__, pacer->pa_burst_tokens); + LSQ_DEBUG("tokens: %u", pacer->pa_burst_tokens); } @@ -120,7 +120,7 @@ lsquic_pacer_can_schedule (struct pacer *pacer, unsigned n_in_flight) else can = 1; - LSQ_DEBUG("%s: %d", __func__, can); + LSQ_DEBUG("%d", can); return can; } diff --git a/src/liblsquic/lsquic_parse_gquic_be.c b/src/liblsquic/lsquic_parse_gquic_be.c index dd4d3c143..271eed24c 100644 --- a/src/liblsquic/lsquic_parse_gquic_be.c +++ b/src/liblsquic/lsquic_parse_gquic_be.c @@ -919,7 +919,7 @@ lsquic_gquic_be_gen_ack_frame (unsigned char *outbuf, size_t outbuf_sz, CHECKOUT(2); time_diff = now - rechist_largest_recv(rechist); lsquic_gquic_be_write_float_time16(time_diff, p); - LSQ_DEBUG("%s: diff: %"PRIu64"; encoded: 0x%04X", __func__, time_diff, + LSQ_DEBUG("diff: %"PRIu64"; encoded: 0x%04X", time_diff, *(uint16_t*)p); p += 2; diff --git a/src/liblsquic/lsquic_qdec_hdl.c b/src/liblsquic/lsquic_qdec_hdl.c index 4a6c3abc7..32498d8f0 100644 --- a/src/liblsquic/lsquic_qdec_hdl.c +++ b/src/liblsquic/lsquic_qdec_hdl.c @@ -143,7 +143,7 @@ qdh_begin_out (struct qpack_dec_hdl *qdh) { if (0 != qdh_write_type(qdh)) { - LSQ_WARN("%s: could not write to decoder", __func__); + LSQ_WARN("could not write to decoder"); qdh->qdh_conn->cn_if->ci_internal_error(qdh->qdh_conn, "cannot write to decoder stream"); } @@ -280,7 +280,7 @@ qdh_out_on_write (struct lsquic_stream *stream, lsquic_stream_ctx_t *ctx) if (lsquic_frab_list_empty(&qdh->qdh_fral)) { - LSQ_DEBUG("%s: nothing to write", __func__); + LSQ_DEBUG("nothing to write"); lsquic_stream_wantwrite(stream, 0); return; } diff --git a/src/liblsquic/lsquic_send_ctl.c b/src/liblsquic/lsquic_send_ctl.c index 19def4a68..34958fd6f 100644 --- a/src/liblsquic/lsquic_send_ctl.c +++ b/src/liblsquic/lsquic_send_ctl.c @@ -1712,8 +1712,8 @@ static int send_ctl_can_send (struct lsquic_send_ctl *ctl) { const unsigned n_out = send_ctl_all_bytes_out(ctl); - LSQ_DEBUG("%s: n_out: %u (unacked_all: %u); cwnd: %"PRIu64 - "; ccfc: %"PRIu64"/%"PRIu64, __func__, + LSQ_DEBUG("n_out: %u (unacked_all: %u); cwnd: %"PRIu64 + "; ccfc: %"PRIu64"/%"PRIu64, n_out, ctl->sc_bytes_unacked_all, ctl->sc_ci->cci_get_cwnd(CGP(ctl)), ctl->sc_conn_pub->conn_cap.cc_sent, @@ -1749,8 +1749,8 @@ send_ctl_can_send_pre_hsk (struct lsquic_send_ctl *ctl) if (bytes_out >= bytes_in * 2 + bytes_in / 2 /* This should work out to around 3 on average */) { - LSQ_DEBUG("%s: amplification block: %u bytes in, %u bytes out", - __func__, bytes_in, bytes_out); + LSQ_DEBUG("amplification block: %u bytes in, %u bytes out", + bytes_in, bytes_out); return 0; } else @@ -2608,7 +2608,7 @@ send_ctl_log_packet_q (const lsquic_send_ctl_t *ctl, const char *prefix, buf = malloc(bufsz); if (!buf) { - LSQ_ERROR("%s: malloc: %s", __func__, strerror(errno)); + LSQ_ERROR("malloc: %s", strerror(errno)); return; } diff --git a/src/liblsquic/lsquic_spi.c b/src/liblsquic/lsquic_spi.c index b8dfde431..947efb1a7 100644 --- a/src/liblsquic/lsquic_spi.c +++ b/src/liblsquic/lsquic_spi.c @@ -119,7 +119,7 @@ find_and_set_lowest_priority (struct stream_prio_iter *iter) if (set >= 4) { - //SPI_DEBUG("%s: cannot find any", __func__); + //SPI_DEBUG("cannot find any"); return -1; } @@ -138,7 +138,7 @@ find_and_set_lowest_priority (struct stream_prio_iter *iter) assert(iter->spi_set[ set ] & (1ULL << bit)); #endif - SPI_DEBUG("%s: prio %u -> %u", __func__, iter->spi_cur_prio, prio); + SPI_DEBUG("prio %u -> %u", iter->spi_cur_prio, prio); iter->spi_cur_prio = (unsigned char) prio; return 0; } @@ -171,7 +171,7 @@ find_and_set_next_priority (struct stream_prio_iter *iter) if (set >= 4) { - //SPI_DEBUG("%s: cannot find any", __func__); + //SPI_DEBUG("cannot find any"); return -1; } @@ -191,7 +191,7 @@ find_and_set_next_priority (struct stream_prio_iter *iter) assert(iter->spi_set[ set ] & (1ULL << bit)); #endif - SPI_DEBUG("%s: prio %u -> %u", __func__, iter->spi_cur_prio, prio); + SPI_DEBUG("prio %u -> %u", iter->spi_cur_prio, prio); iter->spi_cur_prio = (unsigned char) prio; return 0; } @@ -212,7 +212,7 @@ lsquic_spi_first (void *iter_p) { if (0 != find_and_set_lowest_priority(iter)) { - SPI_DEBUG("%s: return NULL", __func__); + SPI_DEBUG("return NULL, iter_p=%p", iter_p); return NULL; } } @@ -220,7 +220,7 @@ lsquic_spi_first (void *iter_p) stream = TAILQ_FIRST(&iter->spi_streams[ iter->spi_cur_prio ]); iter->spi_next_stream = TAILQ_NEXT(stream, next_prio_stream); if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) && !lsquic_stream_is_critical(stream)) - SPI_DEBUG("%s: return stream %"PRIu64", priority %u", __func__, + SPI_DEBUG("return stream %"PRIu64", priority %u", stream->id, iter->spi_cur_prio); return stream; } @@ -237,14 +237,14 @@ lsquic_spi_next (void *iter_p) { iter->spi_next_stream = TAILQ_NEXT(stream, next_prio_stream); if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) && !lsquic_stream_is_critical(stream)) - SPI_DEBUG("%s: return stream %"PRIu64", priority %u", __func__, + SPI_DEBUG("return stream %"PRIu64", priority %u", stream->id, iter->spi_cur_prio); return stream; } if (0 != find_and_set_next_priority(iter)) { - //SPI_DEBUG("%s: return NULL", __func__); + //SPI_DEBUG("return NULL"); return NULL; } @@ -252,7 +252,7 @@ lsquic_spi_next (void *iter_p) iter->spi_next_stream = TAILQ_NEXT(stream, next_prio_stream); if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) && !lsquic_stream_is_critical(stream)) - SPI_DEBUG("%s: return stream %"PRIu64", priority %u", __func__, + SPI_DEBUG("return stream %"PRIu64", priority %u", stream->id, iter->spi_cur_prio); return stream; } diff --git a/src/liblsquic/lsquic_stream.c b/src/liblsquic/lsquic_stream.c index 5baddb65b..8e1b182ec 100644 --- a/src/liblsquic/lsquic_stream.c +++ b/src/liblsquic/lsquic_stream.c @@ -1648,8 +1648,8 @@ stream_readf (struct lsquic_stream *stream, return nread; total_nread += (size_t) nread; - LSQ_DEBUG("%s: read %zd bytes, read offset %"PRIu64", reached fin: %d", - __func__, total_nread, stream->read_offset, + LSQ_DEBUG("read %zd bytes, read offset %"PRIu64", reached fin: %d", + total_nread, stream->read_offset, !!(stream->stream_flags & STREAM_FIN_REACHED)); if (total_nread) @@ -3104,7 +3104,7 @@ verify_conn_cap (const struct lsquic_conn_public *conn_pub) assert(n_buffered + conn_pub->stream_frame_bytes == conn_pub->conn_cap.cc_sent); - LSQ_DEBUG("%s: cc_sent: %"PRIu64, __func__, conn_pub->conn_cap.cc_sent); + LSQ_DEBUG("cc_sent: %"PRIu64, conn_pub->conn_cap.cc_sent); } @@ -4701,7 +4701,7 @@ lsquic_stream_get_hset (struct lsquic_stream *stream) if (stream_is_read_reset(stream)) { - LSQ_INFO("%s: stream is reset, no headers returned", __func__); + LSQ_INFO("stream is reset, no headers returned"); errno = ECONNRESET; return NULL; } @@ -4709,14 +4709,14 @@ lsquic_stream_get_hset (struct lsquic_stream *stream) if (!((stream->sm_bflags & SMBF_USE_HEADERS) && (stream->stream_flags & STREAM_HAVE_UH))) { - LSQ_INFO("%s: unexpected call, flags: 0x%X", __func__, + LSQ_INFO("unexpected call, flags: 0x%X", stream->stream_flags); return NULL; } if (!stream->uh) { - LSQ_INFO("%s: headers unavailable (already fetched?)", __func__); + LSQ_INFO("headers unavailable (already fetched?)"); return NULL; } @@ -5424,7 +5424,7 @@ lsquic_stream_push_promise (struct lsquic_stream *stream, #ifdef FIU_ENABLE if (fiu_fail("stream/fail_initial_pp_write")) { - LSQ_NOTICE("%s: failed to write push promise (fiu)", __func__); + LSQ_NOTICE("failed to write push promise (fiu)"); nw = -1; } else @@ -5505,7 +5505,7 @@ lsquic_stream_set_http_prio (struct lsquic_stream *stream, { if (ehp->urgency > LSQUIC_MAX_HTTP_URGENCY) { - LSQ_INFO("%s: invalid urgency: %hhu", __func__, ehp->urgency); + LSQ_INFO("invalid urgency: %hhu", ehp->urgency); return -1; } stream->sm_priority = ehp->urgency;