sim: added skipping sim_sched_thread_cond_wait_tillemoved if sched_re…

…quests == 0

.gitignore

@@ -76,6 +76,7 @@ TAGS
 tags
 # local build
 /build/
+/build_opt/
 # IDE
 /.cproject
 /.project

contribs/sim/sim_comm.h

@@ -37,6 +37,7 @@ extern void * (*sim_decay_thread_ref)(void *no_data);
 extern uint64_t (*sim_backfill_agent_ref)(void);
 
 extern int64_t sim_slurmdbd_agent_sleep_till;
+extern int64_t sim_slurmdbd_agent_count;
 
 extern void (*sim_slurmctld_req_ref)(slurm_msg_t *msg);
 

contribs/sim/sim_init.c

@@ -34,7 +34,7 @@ int64_t sim_constructor_start_time=0;
 
 
 int64_t sim_slurmdbd_agent_sleep_till = 0;
-
+int64_t sim_slurmdbd_agent_count = 0;
 
 slurm_msg_t * sim_request_msg = NULL;;
 slurm_msg_t * sim_response_msg = NULL;

contribs/sim/slurmctld_controller.c

@@ -547,10 +547,14 @@ int64_t sim_events_loop()
 		}
 	}
 	//
-	if(sim_slurmdbd_agent_sleep_till <= now) {
+	if(sim_slurmdbd_agent_sleep_till <= now || sim_slurmdbd_agent_count >= 100) {
 		if(sim_slurmdbd_agent_ref!=NULL) {
 			(*sim_slurmdbd_agent_ref)(NULL);
+			sim_slurmdbd_agent_count = 0;
 			now = get_sim_utime();
+			if(sim_slurmdbd_agent_sleep_till <= now) {
+				sim_slurmdbd_agent_sleep_till = now + 5*USEC_IN_SEC;
+			}
 		}
 	}
 	// run main scheduler if needed

src/plugins/accounting_storage/slurmdbd/slurmdbd_agent.c

@@ -966,7 +966,8 @@ extern int slurmdbd_agent_send(uint16_t rpc_version, persist_msg_t *req)
 	}
 
 #ifdef SLURM_SIMULATOR
-	sim_slurmdbd_agent_sleep_till = get_sim_utime();
+	//sim_slurmdbd_agent_sleep_till = get_sim_utime();
+	sim_slurmdbd_agent_count = cnt;
 #endif
 	slurm_cond_broadcast(&agent_cond);
 	slurm_mutex_unlock(&agent_lock);