SWPTP-1500: do not block on msg pool for clock feed sync

Author: abower-amd

src/include/sfptpd_multicast.h

@@ -53,12 +53,14 @@ int sfptpd_multicast_unpublish(uint32_t msg_id);
  * @param hdr Header of the message to be sent
  * @param msg_id The message id of the multicast group
  * @param pool Pool from which to allocate the replicated messages
+ * @param wait Wait for free message slots, else abort if not enough
  * @return 0 on success or errno
  */
 int sfptpd_multicast_send(sfptpd_msg_hdr_t *hdr,
 			  uint32_t msg_id,
-			  enum sfptpd_msg_pool_id pool);
-#define SFPTPD_MULTICAST_SEND(msg, msg_id, pool) \
-		sfptpd_multicast_send(&((msg)->hdr), (msg_id), (pool))
+			  enum sfptpd_msg_pool_id pool,
+			  bool wait);
+#define SFPTPD_MULTICAST_SEND(msg, msg_id, pool, wait) \
+		sfptpd_multicast_send(&((msg)->hdr), (msg_id), (pool), (wait))
 
 #endif /* _SFPTPD_MULTICAST_H */

src/sfptpd_clockfeed.c

@@ -290,7 +290,7 @@ static void clockfeed_send_sync_event(struct sfptpd_clockfeed *clockfeed)
 	SFPTPD_MSG_INIT(msg);
 	SFPTPD_MULTICAST_SEND(&msg,
 			      SFPTPD_CLOCKFEED_MSG_SYNC_EVENT,
-			      SFPTPD_MSG_POOL_LOCAL);
+			      SFPTPD_MSG_POOL_LOCAL, false);
 }
 
 static void clockfeed_reap_zombies(struct sfptpd_clockfeed *module,

src/sfptpd_main.c

@@ -744,7 +744,7 @@ static void on_control_socket_fd(int fd)
 		SFPTPD_MSG_INIT(msg.app);
 		SFPTPD_MULTICAST_SEND(&msg.app,
 				      SFPTPD_APP_MSG_DUMP_TABLES,
-				      SFPTPD_MSG_POOL_GLOBAL);
+				      SFPTPD_MSG_POOL_GLOBAL, false);
 		break;
 	case CONTROL_PID_ADJUST:
 		/* Adjust PID controller coefficients */
@@ -762,7 +762,7 @@ static void on_control_socket_fd(int fd)
 		msg.servo.u.pid_adjust.reset = param.pid_adjust.reset;
 		SFPTPD_MULTICAST_SEND(&msg.servo,
 				      SFPTPD_SERVO_MSG_PID_ADJUST,
-				      SFPTPD_MSG_POOL_GLOBAL);
+				      SFPTPD_MSG_POOL_GLOBAL, true);
 		break;
 	}
 }

src/sfptpd_multicast.c

@@ -322,7 +322,8 @@ int sfptpd_multicast_unpublish(uint32_t msg_id)
 
 int sfptpd_multicast_send(sfptpd_msg_hdr_t *hdr,
 			  uint32_t msg_id,
-			  enum sfptpd_msg_pool_id pool)
+			  enum sfptpd_msg_pool_id pool,
+			  bool wait)
 {
 	struct multicast_group *group;
 	struct multicast_user *user;
@@ -359,7 +360,7 @@ int sfptpd_multicast_send(sfptpd_msg_hdr_t *hdr,
 	SLIST_FOREACH(user, &group->subscribers, users) {
 		assert(user->magic == MULTICAST_USER_MAGIC);
 		dests[i].thread = user->thread;
-		dests[i].msg = sfptpd_msg_alloc(pool, true);
+		dests[i].msg = sfptpd_msg_alloc(pool, wait);
 		if (dests[i++].msg == NULL) {
 			rc = errno;
 			break;