Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Usleep macro that sleeps no more than 1 second #4853

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −32
Open

Usleep macro that sleeps no more than 1 second #4853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bdb/berktest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <gettimeofday_ms.h>
#include <errno.h>
#include <logmsg.h>
#include <sys_wrap.h>

static DB_ENV *dbenv = NULL;
static u_int32_t commit_delay_ms = 2;
Expand Down Expand Up @@ -218,7 +219,7 @@ static void run_test(berktable_t *tables, int tablecount, int txnsize,
}

if (commit_delay_ms) {
usleep(commit_delay_ms * 1000);
Usleep(commit_delay_ms * 1000);
}
}

Expand Down
6 changes: 3 additions & 3 deletions bdb/fstdump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ static int close_retry(DBC *dbcp, fstdump_t *common)
if (rc != DB_LOCK_DEADLOCK)
break;
if (++retries > deadlock_sleep_start)
usleep(deadlock_sleep_amt);
Usleep(deadlock_sleep_amt);
}
if (retries == gbl_maxretries) {
logmsg(LOGMSG_ERROR, "ERROR - TOO MUCH CONTENTION (dbcp->c_close)\n");
Expand Down Expand Up @@ -1240,7 +1240,7 @@ static int get_retry(DBC *dbcp, fstdump_t *common, DBT *key, DBT *data,
break;

if (++retries > deadlock_sleep_start)
usleep(deadlock_sleep_amt);
Usleep(deadlock_sleep_amt);
}
if (retries == gbl_maxretries) {
logmsg(LOGMSG_ERROR, "ERROR - TOO MUCH CONTENTION (dbcp->c_get)\n");
Expand Down Expand Up @@ -1287,7 +1287,7 @@ static int open_retry(DBC **dbcp, fstdump_per_thread_t *fstdump,
break;

if (++retries > deadlock_sleep_start)
usleep(deadlock_sleep_amt);
Usleep(deadlock_sleep_amt);
}
if (retries == gbl_maxretries) {
logmsg(LOGMSG_ERROR, "ERROR - TOO MUCH CONTENTION (dbp->cursor)\n");
Expand Down
2 changes: 1 addition & 1 deletion bdb/rep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3965,7 +3965,7 @@ static int process_berkdb(bdb_state_type *bdb_state, char *host, DBT *control, D
poll(NULL, 0, (bdb_state->attr->repsleep));

if (bdb_state->attr->rep_debug_delay > 0)
usleep(bdb_state->attr->rep_debug_delay * 1000);
Usleep(bdb_state->attr->rep_debug_delay * 1000);

rem_rep_mon(&rm);
time2 = comdb2_time_epoch();
Expand Down
2 changes: 1 addition & 1 deletion bdb/threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ void *memp_trickle_thread(void *arg)

if (db_is_exiting())
break;
usleep(time);
Usleep(time);
}

bdb_thread_event(bdb_state, 0);
Expand Down
2 changes: 1 addition & 1 deletion berkdb/lock/lock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ __get_page_latch_int(lt, locker, flags, obj, lock_mode, lock)
while (pollcnt++ < latch_max_poll &&
((ret = pthread_mutex_trylock(&latch->
lock)) != 0))
usleep(latch_poll_us);
Usleep(latch_poll_us);
}

if (ret) {
Expand Down
2 changes: 1 addition & 1 deletion berkdb/mp/mp_fget.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ __memp_send_sparse_page_thread(_)
pgno, &dbt, gbl_pg_compact_thresh) == 0) {
send_pg_compact_req(bdb_state, fileid, dbt.size, dbt.data);
if (gbl_pg_compact_latency_ms > 0)
usleep(gbl_pg_compact_latency_ms * 1000LL);
Usleep(gbl_pg_compact_latency_ms * 1000LL);
}
__os_free(dbenv, dbt.data);
}
Expand Down
2 changes: 1 addition & 1 deletion berkdb/txn/txn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2932,7 +2932,7 @@ __txn_checkpoint(dbenv, kbytes, minutes, flags)
ckp_lsn = prepared;
}
if (unlikely(gbl_ckp_sleep_before_sync > 0))
usleep(gbl_ckp_sleep_before_sync * 1000LL);
Usleep(gbl_ckp_sleep_before_sync * 1000LL);

ckp_lsn_sav = ckp_lsn;
/* If flag is DB_FORCE, don't run perfect checkpoints. */
Expand Down
2 changes: 1 addition & 1 deletion db/osqlblockproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@ int bplog_schemachange_wait(struct ireq *iq, int rc)
int bdberr = 0;
live_sc_off(sc->db);
while (sc->logical_livesc) {
usleep(200);
Usleep(200);
}
if (sc->db->sc_live_logical) {
bdb_clear_logical_live_sc(sc->db->handle, 1);
Expand Down
2 changes: 1 addition & 1 deletion db/osqlcomm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4090,7 +4090,7 @@ int osql_send_usedb(osql_target_t *target, unsigned long long rqid, uuid_t uuid,
if (d_ms) {
logmsg(LOGMSG_DEBUG, "Sleeping for DELAY_AFTER_SAVEOP_USEDB (%dms)\n",
d_ms);
usleep(1000 * d_ms);
Usleep(1000 * d_ms);
}

return rc;
Expand Down
4 changes: 2 additions & 2 deletions db/osqlsqlthr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ static int osql_sock_restart(struct sqlclntstate *clnt, int maxretries,
retries++;
/* if we're shaking really badly, back off */
if (retries > 1)
usleep(retries * 10000); // sleep for a multiple of 10ms
Usleep(retries * 10000); // sleep for a multiple of 10ms

sentops = 0;

Expand Down Expand Up @@ -1754,7 +1754,7 @@ static int osql_send_recordgenid_logic(struct BtCursor *pCur,
rc = osql_send_recordgenid(&osql->target, osql->rqid, osql->uuid,
genid, nettype);
if (gbl_master_swing_sock_restart_sleep) {
usleep(gbl_master_swing_sock_restart_sleep * 1000);
Usleep(gbl_master_swing_sock_restart_sleep * 1000);
}
}
RESTART_SOCKSQL;
Expand Down
2 changes: 1 addition & 1 deletion db/pushlogs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ static void *pushlogs_thread(void *voidarg)

/* throttle this */
if (delayms)
usleep(delayms * 1000);
Usleep(delayms * 1000);
}

if (nwrites > 0) {
Expand Down
6 changes: 3 additions & 3 deletions db/record.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ int add_record(struct ireq *iq, void *trans, const uint8_t *p_buf_tag_name,
if (iq->debug)
reqprintf(iq, "Sleeping for DELAY_WRITES_IN_RECORD_C (%dms)",
d_ms);
int lrc = usleep(1000 * d_ms);
int lrc = Usleep(1000 * d_ms);
if (lrc)
reqprintf(iq, "usleep error rc %d errno %d\n", rc, errno);
}
Expand Down Expand Up @@ -884,7 +884,7 @@ int upd_record(struct ireq *iq, void *trans, void *primkey, int rrn,
if (d_ms) {
if (iq->debug)
reqprintf(iq, "Sleeping for %d ms", d_ms);
usleep(1000 * d_ms);
Usleep(1000 * d_ms);
}

if (!(flags & RECFLAGS_DONT_LOCK_TBL)) {
Expand Down Expand Up @@ -1715,7 +1715,7 @@ int del_record(struct ireq *iq, void *trans, void *primkey, int rrn,
if (d_ms) {
if (iq->debug)
reqprintf(iq, "Sleeping for %d ms", d_ms);
usleep(1000 * d_ms);
Usleep(1000 * d_ms);
}

if (!is_event_from_sc(flags)) {
Expand Down
2 changes: 1 addition & 1 deletion db/sltdbt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ static int handle_op_local(struct ireq *iq, int (*init)(struct ireq *),
deadlocksleepus = (rand() % gbl_maxwthreads * localwait);
/* usleep(0) will likely give up the CPU. Avoid it. */
if (deadlocksleepus != 0)
usleep(deadlocksleepus);
Usleep(deadlocksleepus);
goto retry;
}

Expand Down
2 changes: 1 addition & 1 deletion db/toblock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4501,7 +4501,7 @@ static int toblock_main_int(struct javasp_trans_state *javasp_trans_handle, stru
if (d_ms) {
logmsg(LOGMSG_DEBUG,
"Sleeping for DELAY_AFTER_SAVEOP_DONE (%dms)\n", d_ms);
usleep(1000 * d_ms);
Usleep(1000 * d_ms);
}

if (!(iq->p_buf_in = packedreq_sql_get(
Expand Down
2 changes: 1 addition & 1 deletion net/net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2900,7 +2900,7 @@ int net_init(netinfo_type *netinfo_ptr)
const char *hostlist[REPMAX];
int retry = 100;
while (--retry >= 0 && (rc = net_get_all_nodes_connected(netinfo_ptr, hostlist)) < (num - 1)) {
usleep(10 * 1000); //10ms
Usleep(10 * 1000); //10ms
}
gettimeofday(&b, NULL);
timersub(&b, &a, &c);
Expand Down
2 changes: 1 addition & 1 deletion net/testnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ static void *generator_thd(void *voidarg)
sleep(1);
} else {
dest->send_seqn++;
usleep(gbl_usleep);
Usleep(gbl_usleep);
}
}

Expand Down
6 changes: 3 additions & 3 deletions schemachange/sc_alter_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ int do_alter_table(struct ireq *iq, struct schema_change_type *s,
}

while (s->logical_livesc) {
usleep(200);
Usleep(200);
}

if (db->sc_live_logical) {
Expand Down Expand Up @@ -853,7 +853,7 @@ static int do_merge_table(struct ireq *iq, struct schema_change_type *s,
}

while (s->logical_livesc) {
usleep(200);
Usleep(200);
}

if (db->sc_live_logical) {
Expand Down Expand Up @@ -921,7 +921,7 @@ int finalize_alter_table(struct ireq *iq, struct schema_change_type *s,

/* wait for logical redo thread to stop */
while (s->logical_livesc) {
usleep(200);
Usleep(200);
}

db->sc_to = newdb;
Expand Down
10 changes: 5 additions & 5 deletions schemachange/sc_records.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ static void delay_sc_if_needed(struct convert_record_data *data,
if (delay != 0)
poll(NULL, 0, delay * 5);
else if (BDB_ATTR_GET(thedb->bdb_attr, SC_FORCE_DELAY))
usleep(gbl_sc_usleep);
Usleep(gbl_sc_usleep);

/* if sanc list is not ok, snooze for 100 ms */
if (!net_sanctioned_list_ok(data->from->dbenv->handle_sibling))
Expand Down Expand Up @@ -648,12 +648,12 @@ static int convert_record(struct convert_record_data *data)
}
if (tbl_had_writes(data)) {
/* NB: if we return here, writes could block SC forever, so lets not */
usleep(gbl_sc_usleep);
Usleep(gbl_sc_usleep);
}

/* if master queue latency increased, slow down*/
if (gbl_altersc_latency && gbl_altersc_delay_usec > 0)
usleep(gbl_altersc_delay_usec);
Usleep(gbl_altersc_delay_usec);

if (data->trans == NULL) {
/* Schema-change writes are always page-lock, not rowlock */
Expand Down Expand Up @@ -1240,7 +1240,7 @@ static void *convert_records_thd(struct convert_record_data *data)
use_rebuild_thr(&data->cmembers->thrcount,
&data->cmembers->maxthreads)) {
/* num thread at max, sleep few microsec then try again */
usleep(bdb_attr_get(data->from->dbenv->bdb_attr,
Usleep(bdb_attr_get(data->from->dbenv->bdb_attr,
BDB_ATTR_SC_NO_REBUILD_THR_SLEEP));
continue;
}
Expand Down Expand Up @@ -1846,7 +1846,7 @@ static int upgrade_records(struct convert_record_data *data)

/* snooze for a bit if writes have been coming in */
if (gbl_sc_last_writer_time >= comdb2_time_epoch() - 5)
usleep(gbl_sc_usleep);
Usleep(gbl_sc_usleep);
break;
} // end of rc check

Expand Down
2 changes: 1 addition & 1 deletion schemachange/schemachange.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ void delay_if_sc_resuming(struct ireq *iq)
diff);
printerr = 1; // avoid spew
}
usleep(10000); // 10ms
Usleep(10000); // 10ms
}
}

Expand Down
2 changes: 1 addition & 1 deletion sqlite/src/func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static void usleepFunc(sqlite3_context *context, int argc, sqlite3_value *argv[]
while( remain > 0 ){
us = ( remain > 1000000 ) ? 1000000 : remain;
remain -= us;
usleep(us);
Usleep(us);
if( comdb2_sql_tick() )
break;
}
Expand Down
13 changes: 13 additions & 0 deletions util/sys_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,19 @@
rc; \
})

#define Usleep(usec) \
({ \
int rc; \
if ((unsigned int)(usec) <= 1000000) { \
rc = usleep((usec)); \
} else { \
logmsg(LOGMSG_ERROR, "usleep argument out of range: %u, capping the value at 1000000\n", \
(unsigned int)(usec)); \
rc = usleep(1000000); \
} \
rc; \
})

#define Pthread_attr_destroy(...) WRAP_SYSFUNC(pthread_attr_destroy, __VA_ARGS__)
#define Pthread_attr_init(...) WRAP_SYSFUNC(pthread_attr_init, __VA_ARGS__)
#define Pthread_attr_setdetachstate(...) WRAP_SYSFUNC(pthread_attr_setdetachstate, __VA_ARGS__)
Expand Down
2 changes: 1 addition & 1 deletion util/thdpool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ int thdpool_destroy(struct thdpool **pool_p, int coopWaitUs)
unsigned int elapsedUs = 0;
thdpool_stop(pool);
while (ATOMIC_LOAD32(pool->nactthd) > 0) {
usleep(waitUs);
Usleep(waitUs);
elapsedUs += waitUs;
if ((coopWaitUs > 0) && (elapsedUs >= (unsigned int)coopWaitUs)) {
logmsg(LOGMSG_ERROR,
Expand Down