hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1775 Rename server_clear_set_status

Browse Source 
Renamed to server_clear_set_status_nolock, like all other non-locking
functions are called. Rename arguments to be self-explanatory.
This commit is contained in:
Johan Wikman
2018-05-24 14:41:01 +03:00
parent f50ebfce2a
commit c0ace6a694
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/server.cc
View File

@ -730,16 +730,16 @@ server_set_status_nolock(SERVER *server, uint64_t bit)
}
/**
* Set one or more status bit(s) from a specified set, clearing any others
* in the specified set
* Clears and sets specified bits.
*
* @attention This function does no locking
*
* @param server The server to update
* @param bit The bit to set for the server
* @param server The server to update
* @param bits_to_clear The bits to clear for the server.
* @param bits_to_set The bits to set for the server.
*/
void
server_clear_set_status(SERVER *server, uint64_t specified_bits, uint64_t bits_to_set)
server_clear_set_status_nolock(SERVER *server, uint64_t bits_to_clear, uint64_t bits_to_set)
{
/** clear error logged flag before the next failure */
if ((bits_to_set & SERVER_MASTER) && ((server->status & SERVER_MASTER) == 0))
@ -747,9 +747,9 @@ server_clear_set_status(SERVER *server, uint64_t specified_bits, uint64_t bits_t
server->master_err_is_logged = false;
}
if ((server->status & specified_bits) != bits_to_set)
if ((server->status & bits_to_clear) != bits_to_set)
{
server->status = (server->status & ~specified_bits) | bits_to_set;
server->status = (server->status & ~bits_to_clear) | bits_to_set;
}
}