protocols: handle PP_SEND_NO_STAMP specially

This is the result of an audit of all send functions. Most are not affected, because they send on the "general" channel. But when event messages are sent, an error of SEND_NO_STAMP must not be fatal. In WR, for example, after a sync the stamping engine reports invalid stamps for a second. I chose not to change the return type of the sending function and have the compiler help me, because my mates are working on peer-delay and I'd better not make the merge more difficult for us. Unfortunately, my wrs is still not syncing with this patch, as it remains stuck in SYNC_NSEC (in the state machine within the WR servo). See next commit.... Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

protocols: handle PP_SEND_NO_STAMP specially
This is the result of an audit of all send functions. Most are not affected, because they send on the "general" channel. But when event messages are sent, an error of SEND_NO_STAMP must not be fatal. In WR, for example, after a sync the stamping engine reports invalid stamps for a second. I chose not to change the return type of the sending function and have the compiler help me, because my mates are working on peer-delay and I'd better not make the merge more difficult for us. Unfortunately, my wrs is still not syncing with this patch, as it remains stuck in SYNC_NSEC (in the state machine within the WR servo). See next commit.... Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
7c62f416 · Alessandro Rubini · 9e78f4ac · 7c62f416 · 7c62f416 · 7c62f416
Commit 7c62f416 authored Jun 04, 2015 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 10 deletions

hooks.c proto-ext-whiterabbit/hooks.c +1 -1

state-master.c proto-standard/state-master.c +17 -5

state-slave.c proto-standard/state-slave.c +10 -4

No files found.
--- a/proto-ext-whiterabbit/hooks.c
+++ b/proto-ext-whiterabbit/hooks.c
@@ -82,7 +82,7 @@ static int wr_master_msg(struct pp_instance *ppi, unsigned char *pkt, int plen,
 		hdr->correctionfield.msb = 0;
 		hdr->correctionfield.lsb =
 			phase_to_cf_units(ppi->last_rcv_time.phase);
-		msg_issue_delay_resp(ppi, time);
+		msg_issue_delay_resp(ppi, time); /* no error check */
 		msgtype = PPM_NOTHING_TO_DO;
 		break;


--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -56,7 +56,7 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		msgtype = pp_hooks.master_msg(ppi, pkt, plen, msgtype);
 	if (msgtype < 0) {
 		e = msgtype;
-		goto out;
+		goto out_fault;
 	}

 	switch (msgtype) {
@@ -89,16 +89,28 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	}

 out:
-	if (e == 0) {
+	switch(e) {
+	case PP_SEND_OK: /* 0 */
 		if (DSDEF(ppi)->clockQuality.clockClass == PP_CLASS_SLAVE_ONLY
 		    || (ppi->role == PPSI_ROLE_SLAVE))
 			ppi->next_state = PPS_LISTENING;
-	} else {
-		ppi->next_state = PPS_FAULTY;
+		break;
+	case PP_SEND_ERROR:
+		goto out_fault;
+
+	case PP_SEND_NO_STAMP:
+		/* nothing, just keep the ball rolling */
+		e = 0;
+		break;
 	}

 	d1 = pp_ms_to_timeout(ppi, PP_TO_ANN_INTERVAL);
 	d2 = pp_ms_to_timeout(ppi, PP_TO_SYNC);
 	ppi->next_delay = d1 < d2 ? d1 : d2;
-	return 0;
+	return e;
+
+out_fault:
+	ppi->next_state = PPS_FAULTY;
+	ppi->next_delay = 500; /* just a delay to releif the system */
+	return e;
 }
--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -128,12 +128,18 @@ out:
 				 &OPTS(ppi)->outbound_latency);
 	}

-	if (e) {
+	switch(e) {
+	case PP_SEND_OK: /* 0 */
+		break;
+	case PP_SEND_ERROR:
 		ppi->next_state = PPS_FAULTY;
-		return 0;
+		break;
+	case PP_SEND_NO_STAMP:
+		/* nothing, just keep the ball rolling */
+		e = 0;
+		break;
 	}

-	/* Leaving this state */
 	if (ppi->next_state != ppi->state) {
 		pp_timeout_clr(ppi, PP_TO_ANN_RECEIPT);
 		pp_timeout_clr(ppi, PP_TO_DELAYREQ);
@@ -144,5 +150,5 @@ out:
 	if (ppi->timeouts[PP_TO_DELAYREQ])
 		d2 = pp_ms_to_timeout(ppi, PP_TO_DELAYREQ);
 	ppi->next_delay = d1 < d2 ? d1 : d2;
-	return 0;
+	return e;
 }