wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

transaction tagging

This commit is contained in:
Kao Makino 2020-08-27 13:25:14 -07:00
parent 939f59d989
commit b18f802f78
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bindings/c/test/mako/mako.c
View File

@ -698,7 +698,7 @@ retryTxn:
} }
int run_workload(FDBTransaction* transaction, mako_args_t* args, int thread_tps, volatile double* throttle_factor, int run_workload(FDBTransaction* transaction, mako_args_t* args, int thread_tps, volatile double* throttle_factor,
int thread_iters, volatile int* signal, mako_stats_t* stats, int dotrace, lat_block_t* block[], int thread_iters, volatile int* signal, mako_stats_t* stats, int dotrace, int dotagging, lat_block_t* block[],
int* elem_size, bool* is_memory_allocated) { int* elem_size, bool* is_memory_allocated) {
int xacts = 0; int xacts = 0;
int64_t total_xacts = 0; int64_t total_xacts = 0;
@ -774,6 +774,16 @@ int run_workload(FDBTransaction* transaction, mako_args_t* args, int thread_tps,
} }
} }
/* enable write tagging */
if (dotagging) {
err = fdb_transaction_set_option(transaction, FDB_TR_OPTION_AUTO_THROTTLE_TAG,
(uint8_t*)"mako_transaction", 16);
if (err) {
fprintf(stderr, "ERROR: FDB_TR_OPTION_DEBUG_TRANSACTION_IDENTIFIER: %s\n",
fdb_get_error(err));
}
}
} else { } else {
if (thread_tps > 0) { if (thread_tps > 0) {
/* 1 second not passed, throttle */ /* 1 second not passed, throttle */
@ -876,6 +886,7 @@ void* worker_thread(void* thread_args) {
int op; int op;
int i, size; int i, size;
int dotrace = (worker_id == 0 && thread_id == 0 && args->txntrace) ? args->txntrace : 0; int dotrace = (worker_id == 0 && thread_id == 0 && args->txntrace) ? args->txntrace : 0;
int dotagging = (worker_id == 0 && thread_id == 0 && args->txntagging) ? args->txntagging : 0;
volatile int* signal = &((thread_args_t*)thread_args)->process->shm->signal; volatile int* signal = &((thread_args_t*)thread_args)->process->shm->signal;
volatile double* throttle_factor = &((thread_args_t*)thread_args)->process->shm->throttle_factor; volatile double* throttle_factor = &((thread_args_t*)thread_args)->process->shm->throttle_factor;
volatile int* readycount = &((thread_args_t*)thread_args)->process->shm->readycount; volatile int* readycount = &((thread_args_t*)thread_args)->process->shm->readycount;
@ -940,8 +951,8 @@ void* worker_thread(void* thread_args) {
/* run the workload */ /* run the workload */
else if (args->mode == MODE_RUN) { else if (args->mode == MODE_RUN) {
rc = run_workload(transaction, args, thread_tps, throttle_factor, thread_iters, signal, stats, dotrace, block, rc = run_workload(transaction, args, thread_tps, throttle_factor, thread_iters,
elem_size, is_memory_allocated); signal, stats, dotrace, dotagging, block, elem_size, is_memory_allocated);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "ERROR: run_workload failed\n"); fprintf(stderr, "ERROR: run_workload failed\n");
} }
@ -1209,6 +1220,7 @@ int init_args(mako_args_t* args) {
args->tracepath[0] = '\0'; args->tracepath[0] = '\0';
args->traceformat = 0; /* default to client's default (XML) */ args->traceformat = 0; /* default to client's default (XML) */
args->txntrace = 0; args->txntrace = 0;
args->txntagging = 0;
for (i = 0; i < MAX_OP; i++) { for (i = 0; i < MAX_OP; i++) {
args->txnspec.ops[i][OP_COUNT] = 0; args->txnspec.ops[i][OP_COUNT] = 0;
} }
@ -1366,6 +1378,7 @@ void usage() {
printf("%-24s %s\n", " --tracepath=PATH", "Set trace file path"); printf("%-24s %s\n", " --tracepath=PATH", "Set trace file path");
printf("%-24s %s\n", " --trace_format <xml|json>", "Set trace format (Default: json)"); printf("%-24s %s\n", " --trace_format <xml|json>", "Set trace format (Default: json)");
printf("%-24s %s\n", " --txntrace=sec", "Specify transaction tracing interval (Default: 0)"); printf("%-24s %s\n", " --txntrace=sec", "Specify transaction tracing interval (Default: 0)");
printf("%-24s %s\n", " --txntagging", "Enable transaction tagging");
printf("%-24s %s\n", " --knobs=KNOBS", "Set client knobs"); printf("%-24s %s\n", " --knobs=KNOBS", "Set client knobs");
printf("%-24s %s\n", " --flatbuffers", "Use flatbuffers"); printf("%-24s %s\n", " --flatbuffers", "Use flatbuffers");
} }
@ -1407,6 +1420,7 @@ int parse_args(int argc, char* argv[], mako_args_t* args) {
{ "commitget", no_argument, NULL, ARG_COMMITGET }, { "commitget", no_argument, NULL, ARG_COMMITGET },
{ "flatbuffers", no_argument, NULL, ARG_FLATBUFFERS }, { "flatbuffers", no_argument, NULL, ARG_FLATBUFFERS },
{ "trace", no_argument, NULL, ARG_TRACE }, { "trace", no_argument, NULL, ARG_TRACE },
{ "txntagging", required_argument, NULL, ARG_TXNTAGGING },
{ "version", no_argument, NULL, ARG_VERSION }, { "version", no_argument, NULL, ARG_VERSION },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -1523,6 +1537,10 @@ int parse_args(int argc, char* argv[], mako_args_t* args) {
args->txntrace = atoi(optarg); args->txntrace = atoi(optarg);
break; break;
} }
case ARG_TXNTAGGING:
args->txntagging = 1;
break;
}
} }
if ((args->tpsmin == -1) || (args->tpsmin > args->tpsmax)) { if ((args->tpsmin == -1) || (args->tpsmin > args->tpsmax)) {
args->tpsmin = args->tpsmax; args->tpsmin = args->tpsmax;

4
bindings/c/test/mako/mako.h
View File

@ -75,7 +75,8 @@ enum Arguments {
ARG_TPSMIN, ARG_TPSMIN,
ARG_TPSINTERVAL, ARG_TPSINTERVAL,
ARG_TPSCHANGE, ARG_TPSCHANGE,
ARG_TXNTRACE ARG_TXNTRACE,
ARG_TXNTAGGING
}; };
enum TPSChangeTypes { TPS_SIN, TPS_SQUARE, TPS_PULSE }; enum TPSChangeTypes { TPS_SIN, TPS_SQUARE, TPS_PULSE };
@ -124,6 +125,7 @@ typedef struct {
char knobs[KNOB_MAX]; char knobs[KNOB_MAX];
uint8_t flatbuffers; uint8_t flatbuffers;
int txntrace; int txntrace;
int txntagging;
} mako_args_t; } mako_args_t;
/* shared memory */ /* shared memory */