PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More transmit timing debug code.

This commit is contained in:
wb2osz 2019-04-21 19:09:41 -04:00
parent bfa7f4af93
commit 8a2138e16b
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xmit.c
View File

@ -522,7 +522,7 @@ static void * xmit_thread (void *arg)
tq_wait_while_empty (chan); tq_wait_while_empty (chan);
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread, channel %d: woke up\n", c); dw_printf ("xmit_thread, channel %d: woke up\n", chan);
#endif #endif
// Does this extra loop offer any benefit? // Does this extra loop offer any benefit?
@ -751,11 +751,10 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: Turn on PTT now for channel %d. speed = %d\n", chan, xmit_bits_per_sec[chan]); dw_printf ("xmit_thread: t=%.3f, Turn on PTT now for channel %d. speed = %d\n", dtime_now()-time_ptt, chan, xmit_bits_per_sec[chan]);
#endif #endif
ptt_set (OCTYPE_PTT, chan, 1); ptt_set (OCTYPE_PTT, chan, 1);
// Inform data link state machine that we are now transmitting. // Inform data link state machine that we are now transmitting.
dlq_seize_confirm (chan); // C4.2. "This primitive indicates, to the Data-link State dlq_seize_confirm (chan); // C4.2. "This primitive indicates, to the Data-link State
@ -765,7 +764,8 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
num_bits = hdlc_send_flags (chan, pre_flags, 0); num_bits = hdlc_send_flags (chan, pre_flags, 0);
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: txdelay=%d [*10], pre_flags=%d, num_bits=%d\n", xmit_txdelay[chan], pre_flags, num_bits); dw_printf ("xmit_thread: t=%.3f, txdelay=%d [*10], pre_flags=%d, num_bits=%d\n", dtime_now()-time_ptt, xmit_txdelay[chan], pre_flags, num_bits);
double presleep = dtime_now();
#endif #endif
SLEEP_MS (10); // Give data link state machine a chance to SLEEP_MS (10); // Give data link state machine a chance to
@ -773,6 +773,16 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
// in response to dlq_seize_confirm, so // in response to dlq_seize_confirm, so
// we don't run off the end too soon. // we don't run off the end too soon.
#if DEBUG
text_color_set(DW_COLOR_DEBUG);
// How long did sleep last?
dw_printf ("xmit_thread: t=%.3f, Should be 0.010 second after the above.\n", dtime_now()-time_ptt);
double naptime = dtime_now() - presleep;
if (naptime > 0.015) {
text_color_set(DW_COLOR_ERROR);
dw_printf ("Sleep for 10 ms actually took %.3f second!\n", naptime);
}
#endif
/* /*
* Transmit the frame. * Transmit the frame.
@ -784,7 +794,7 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
if (nb > 0) numframe++; if (nb > 0) numframe++;
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: flen=%d, nb=%d, num_bits=%d, numframe=%d\n", flen, nb, num_bits, numframe); dw_printf ("xmit_thread: t=%.3f, nb=%d, num_bits=%d, numframe=%d\n", dtime_now()-time_ptt, nb, num_bits, numframe);
#endif #endif
ax25_delete (pp); ax25_delete (pp);
@ -826,7 +836,7 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
pp = tq_remove (chan, prio); pp = tq_remove (chan, prio);
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: tq_remove(chan=%d, prio=%d) returned %p\n", chan, prio, pp); dw_printf ("xmit_thread: t=%.3f, tq_remove(chan=%d, prio=%d) returned %p\n", dtime_now()-time_ptt, chan, prio, pp);
#endif #endif
nb = send_one_frame (chan, prio, pp); nb = send_one_frame (chan, prio, pp);
@ -835,7 +845,7 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
if (nb > 0) numframe++; if (nb > 0) numframe++;
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: flen=%d, nb=%d, num_bits=%d, numframe=%d\n", flen, nb, num_bits, numframe); dw_printf ("xmit_thread: t=%.3f, nb=%d, num_bits=%d, numframe=%d\n", dtime_now()-time_ptt, nb, num_bits, numframe);
#endif #endif
ax25_delete (pp); ax25_delete (pp);
@ -856,7 +866,7 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
num_bits += nb; num_bits += nb;
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: txtail=%d [*10], post_flags=%d, nb=%d, num_bits=%d\n", xmit_txtail[chan], post_flags, nb, num_bits); dw_printf ("xmit_thread: t=%.3f, txtail=%d [*10], post_flags=%d, nb=%d, num_bits=%d\n", dtime_now()-time_ptt, xmit_txtail[chan], post_flags, nb, num_bits);
#endif #endif
@ -889,7 +899,7 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
dw_printf ("xmit_thread: xmit duration=%d, %d already elapsed since PTT, wait %d more\n", duration, already, wait_more ); dw_printf ("xmit_thread: t=%.3f, xmit duration=%d, %d already elapsed since PTT, wait %d more\n", dtime_now()-time_ptt, duration, already, wait_more );
#endif #endif
if (wait_more > 0) { if (wait_more > 0) {
@ -915,7 +925,7 @@ static void xmit_ax25_frames (int chan, int prio, packet_t pp, int max_bundle)
#if DEBUG #if DEBUG
text_color_set(DW_COLOR_DEBUG); text_color_set(DW_COLOR_DEBUG);
time_now = dtime_now(); time_now = dtime_now();
dw_printf ("xmit_thread: Turn off PTT now. Actual time on was %d mS, vs. %d desired\n", (int) ((time_now - time_ptt) * 1000.), duration); dw_printf ("xmit_thread: t=%.3f, Turn off PTT now. Actual time on was %d mS, vs. %d desired\n", dtime_now()-time_ptt, (int) ((time_now - time_ptt) * 1000.), duration);
#endif #endif
ptt_set (OCTYPE_PTT, chan, 0); ptt_set (OCTYPE_PTT, chan, 0);
@ -1147,9 +1157,9 @@ static void xmit_speech (int c, packet_t pp)
int xmit_speak_it (char *script, int c, char *orig_msg) int xmit_speak_it (char *script, int c, char *orig_msg)
{ {
int err; int err;
char cmd[2000];
char *p;
char msg[2000]; char msg[2000];
char cmd[sizeof(msg) + 16];
char *p;
/* Remove any quotes because it will mess up command line argument parsing. */ /* Remove any quotes because it will mess up command line argument parsing. */