proto-standard: add fsm-lib.c to factorize a timeout stanza

To help me knowning what is audited and what is not, I will rename the "common functions" to fsm-lib. Let's now open this pp_lib_* name space with some more timeout cleanup. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

proto-standard: add fsm-lib.c to factorize a timeout stanza
To help me knowning what is audited and what is not, I will rename the "common functions" to fsm-lib. Let's now open this pp_lib_* name space with some more timeout cleanup. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
c90cfd41 · Alessandro Rubini · 3c0f2a03 · c90cfd41 · c90cfd41 · c90cfd41
Commit c90cfd41 authored Mar 03, 2016 by Alessandro Rubini
7 changed files
--- a/include/ppsi/ppsi.h
+++ b/include/ppsi/ppsi.h
@@ -57,6 +57,8 @@ struct pp_vlanhdr {
 	uint16_t h_proto;
 };
+/* Helpers for the fsm (fsm-lib.c) */
+extern int pp_lib_may_issue_request(struct pp_instance *ppi);
 /* We use data sets a lot, so have these helpers */
 static inline struct pp_globals *GLBS(struct pp_instance *ppi)

--- a/proto-standard/Makefile
+++ b/proto-standard/Makefile
@@ -4,6 +4,7 @@
 D := proto-standard
 OBJ-y += $D/fsm-table.o \
+	$D/fsm-lib.o \
 	$D/state-initializing.o \
 	$D/state-faulty.o \
 	$D/state-disabled.o \

--- a/proto-standard/fsm-lib.c
+++ b/proto-standard/fsm-lib.c
+/*
+ * Copyright (C) 2011 CERN (www.cern.ch)
+ * Author: Aurelio Colosimo
+ * Copyright (C) 2014 GSI (www.gsi.de)
+ * Author: Alessandro Rubin
+ *
+ * Released according to the GNU LGPL, version 2.1 or any later version.
+ */
+#include <ppsi/ppsi.h>
+int pp_lib_may_issue_request(struct pp_instance *ppi)
+{
+	int e;
+	if (!pp_timeout(ppi, PP_TO_REQUEST))
+		return 0;
+	pp_timeout_set(ppi, PP_TO_REQUEST);
+	e = msg_issue_request(ppi);
+	if (e)
+		return e;
+	ppi->t3 = ppi->last_snt_time;
+	return 0;
+}
--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -21,15 +21,8 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		goto out;
 	/* when the clock is using peer-delay, listening must send it too */
-	if (ppi->glbs->delay_mech == PP_P2P_MECH
+	if (ppi->glbs->delay_mech == PP_P2P_MECH)
-	    && pp_timeout_z(ppi, PP_TO_REQUEST)) {
+		e  = pp_lib_may_issue_request(ppi);
-		e = msg_issue_request(ppi);
-		ppi->t3 = ppi->last_snt_time;
-		/* Restart the timeout for next time */
-		pp_timeout_set(ppi, PP_TO_REQUEST);
-	}
 	if (plen == 0)
 		goto out;

--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -85,15 +85,8 @@ int pp_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	}
 	/* when the clock is using peer-delay, the muster mast send it too */
-	if (ppi->glbs->delay_mech == PP_P2P_MECH
+	if (ppi->glbs->delay_mech == PP_P2P_MECH)
-	    && pp_timeout_z(ppi, PP_TO_REQUEST)) {
+		e  = pp_lib_may_issue_request(ppi);
-		e = msg_issue_request(ppi);
-		ppi->t3 = ppi->last_snt_time;
-		/* Restart the timeout for next time */
-		pp_timeout_set(ppi, PP_TO_REQUEST);
-	}
 	if (plen == 0)
 		goto out;

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
@@ -16,15 +16,8 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	MsgPDelayRespFollowUp respFllw;
 	/* when the clock is using peer-delay, listening must send it too */
-	if (ppi->glbs->delay_mech == PP_P2P_MECH
+	if (ppi->glbs->delay_mech == PP_P2P_MECH)
-	    && pp_timeout_z(ppi, PP_TO_REQUEST)) {
+		e  = pp_lib_may_issue_request(ppi);
-		e = msg_issue_request(ppi);
-		ppi->t3 = ppi->last_snt_time;
-		/* Restart the timeout for next time */
-		pp_timeout_set(ppi, PP_TO_REQUEST);
-	}
 	if (plen == 0)
 		goto no_incoming_msg;

--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -29,6 +29,8 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			goto out;
 	}
+	e  = pp_lib_may_issue_request(ppi);
 	if (plen == 0)
 		goto out;
@@ -139,15 +141,6 @@ out:
 	if (e == 0)
 		e = st_com_execute_slave(ppi);
-	if (pp_timeout_z(ppi, PP_TO_REQUEST)) {
-		e = msg_issue_request(ppi);
-		ppi->t3 = ppi->last_snt_time;
-		/* Restart the timeout for next time */
-		pp_timeout_set(ppi, PP_TO_REQUEST);
-	}
 	switch(e) {
 	case PP_SEND_OK: /* 0 */
 		break;