1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dequeued_count my_atomic to Atomic_counter

Browse Source 
Also allocate inuse_relaylog with new rather than my_malloc(MY_ZEROFILL).
This commit is contained in:
Sergey Vojtovich 2020-03-25 17:27:42 +04:00
parent 98fc6b923f
commit 1c8de231a3
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/rpl_parallel.cc
View File

@ -1775,7 +1775,7 @@ rpl_parallel_thread::inuse_relaylog_refcount_update()
inuse_relaylog *ir= accumulated_ir_last; inuse_relaylog *ir= accumulated_ir_last;
if (ir) if (ir)
{ {
my_atomic_add64(&ir->dequeued_count, accumulated_ir_count); ir->dequeued_count+= accumulated_ir_count;
accumulated_ir_count= 0; accumulated_ir_count= 0;
accumulated_ir_last= NULL; accumulated_ir_last= NULL;
} }

20
sql/rpl_rli.cc
View File

@ -1435,31 +1435,27 @@ Relay_log_info::alloc_inuse_relaylog(const char *name)
uint32 gtid_count; uint32 gtid_count;
rpl_gtid *gtid_list; rpl_gtid *gtid_list;
if (!(ir= (inuse_relaylog *)my_malloc(sizeof(*ir), MYF(MY_WME|MY_ZEROFILL))))
{
my_error(ER_OUTOFMEMORY, MYF(0), (int)sizeof(*ir));
return 1;
}
gtid_count= relay_log_state.count(); gtid_count= relay_log_state.count();
if (!(gtid_list= (rpl_gtid *)my_malloc(sizeof(*gtid_list)*gtid_count, if (!(gtid_list= (rpl_gtid *)my_malloc(sizeof(*gtid_list)*gtid_count,
MYF(MY_WME)))) MYF(MY_WME))))
{ {
my_free(ir);
my_error(ER_OUTOFMEMORY, MYF(0), (int)sizeof(*gtid_list)*gtid_count); my_error(ER_OUTOFMEMORY, MYF(0), (int)sizeof(*gtid_list)*gtid_count);
return 1; return 1;
} }
if (!(ir= new inuse_relaylog(this, gtid_list, gtid_count, name)))
{
my_free(gtid_list);
my_error(ER_OUTOFMEMORY, MYF(0), (int) sizeof(*ir));
return 1;
}
if (relay_log_state.get_gtid_list(gtid_list, gtid_count)) if (relay_log_state.get_gtid_list(gtid_list, gtid_count))
{ {
my_free(gtid_list); my_free(gtid_list);
my_free(ir); delete ir;
DBUG_ASSERT(0 /* Should not be possible as we allocated correct length */); DBUG_ASSERT(0 /* Should not be possible as we allocated correct length */);
my_error(ER_OUT_OF_RESOURCES, MYF(0)); my_error(ER_OUT_OF_RESOURCES, MYF(0));
return 1; return 1;
} }
ir->rli= this;
strmake_buf(ir->name, name);
ir->relay_log_state= gtid_list;
ir->relay_log_state_count= gtid_count;
if (!inuse_relaylog_list) if (!inuse_relaylog_list)
inuse_relaylog_list= ir; inuse_relaylog_list= ir;
@ -1478,7 +1474,7 @@ void
Relay_log_info::free_inuse_relaylog(inuse_relaylog *ir) Relay_log_info::free_inuse_relaylog(inuse_relaylog *ir)
{ {
my_free(ir->relay_log_state); my_free(ir->relay_log_state);
my_free(ir); delete ir;
} }

12
sql/rpl_rli.h
View File

@ -608,10 +608,20 @@ struct inuse_relaylog {
/* Number of events in this relay log queued for worker threads. */ /* Number of events in this relay log queued for worker threads. */
int64 queued_count; int64 queued_count;
/* Number of events completed by worker threads. */ /* Number of events completed by worker threads. */
volatile int64 dequeued_count; Atomic_counter<int64> dequeued_count;
/* Set when all events have been read from a relaylog. */ /* Set when all events have been read from a relaylog. */
bool completed; bool completed;
char name[FN_REFLEN]; char name[FN_REFLEN];
inuse_relaylog(Relay_log_info *rli_arg, rpl_gtid *relay_log_state_arg,
uint32 relay_log_state_count_arg,
const char *name_arg):
next(0), rli(rli_arg), relay_log_state(relay_log_state_arg),
relay_log_state_count(relay_log_state_count_arg), queued_count(0),
dequeued_count(0), completed(false)
{
strmake_buf(name, name_arg);
}
}; };