X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fsi%2Fsrc%2Frmr_si.c;h=93475f9a9f064d15eb7d685866925c4b8da1e973;hb=cc314e0c526a0ed0ce9295e490b3f2bb29c3332c;hp=712275e2e3f32b7387190636f0e9694b64c5d631;hpb=fc2112d22bf69b4bfbe0c419ed366f0d0ec370ca;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/si/src/rmr_si.c b/src/rmr/si/src/rmr_si.c
index 712275e..93475f9 100644
--- a/src/rmr/si/src/rmr_si.c
+++ b/src/rmr/si/src/rmr_si.c
@@ -556,14 +556,16 @@ static void* init(  char* uproto_port, int def_msg_size, int flags ) {
 	int		old_vlevel;
 
 	old_vlevel = rmr_vlog_init();			// initialise and get the current level
-	rmr_set_vlevel( RMR_VL_INFO );		// we WILL announce our version etc
 
 	if( ! announced ) {
+		rmr_set_vlevel( RMR_VL_INFO );		// we WILL announce our version
 		rmr_vlog( RMR_VL_INFO, "ric message routing library on SI95/g mv=%d flg=%02x (%s %s.%s.%s built: %s)\n",
 			RMR_MSG_VER, flags, QUOTE_DEF(GIT_ID), QUOTE_DEF(MAJOR_VER), QUOTE_DEF(MINOR_VER), QUOTE_DEF(PATCH_VER), __DATE__ );
 		announced = 1;
+
+		rmr_set_vlevel( old_vlevel );		// return logging to the desired state
+		uta_dump_env();							// spit out environment settings meaningful to us if in info mode
 	}
-	rmr_set_vlevel( old_vlevel );		// return logging to the desired state
 
 	errno = 0;
 	if( uproto_port == NULL ) {
@@ -702,9 +704,12 @@ static void* init(  char* uproto_port, int def_msg_size, int flags ) {
 												// finish all flag setting before threads to keep helgrind quiet
 	ctx->flags |= CFL_MTC_ENABLED;				// for SI threaded receiver is the only way
 
-	if( flags & RMRFL_NOTHREAD ) {				// thread set to off; no route table collector started (could be called by the rtc thread itself)
-		ctx->rtable = rt_clone_space( NULL, NULL, 0 );		// creates an empty route table so that wormholes still can be used
+	ctx->rtable = rt_clone_space( NULL, NULL, 0 );		// create an empty route table so that wormhole/rts calls can be used
+	if( flags & RMRFL_NOTHREAD ) {						// no thread prevents the collector start for very special cases
+		ctx->rtable_ready = 1;							// route based sends will always fail, but rmr is ready for the non thread case
 	} else {
+		ctx->rtable_ready = 0;							// no sends until a real route table is loaded in the rtc thread
+
 		if( static_rtc ) {
 			rmr_vlog( RMR_VL_INFO, "rmr_init: file based route table only for context on port %s\n", uproto_port );
 			if( pthread_create( &ctx->rtc_th,  NULL, rtc_file, (void *) ctx ) ) { 	// kick the rt collector thread as just file reader
@@ -777,11 +782,7 @@ extern int rmr_ready( void* vctx ) {
 		return FALSE;
 	}
 
-	if( ctx->rtable != NULL ) {
-		return TRUE;
-	}
-
-	return FALSE;
+	return ctx->rtable_ready;
 }
 
 /*
@@ -867,6 +868,8 @@ extern rmr_mbuf_t* rmr_mt_rcv( void* vctx, rmr_mbuf_t* mbuf, int max_wait ) {
 
 	if( max_wait == 0 ) {						// one shot poll; handle wihtout sem check as that is SLOW!
 		if( (mbuf = (rmr_mbuf_t *) uta_ring_extract( ctx->mring )) != NULL ) {			// pop if queued
+			clock_gettime( CLOCK_REALTIME, &ts );			// pass current time as expriry time
+			sem_timedwait( &chute->barrier, &ts );			// must pop the count (ring is locking so if we got a message we can pop)
 			if( ombuf ) {
 				rmr_free_msg( ombuf );				// can't reuse, caller's must be trashed now
 			}