-
Notifications
You must be signed in to change notification settings - Fork 412
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Bug Fix] Fix for undefined MySQL library behavior. (#2834)
* MYSQL objects cannot be copied in a well defined way, this removes the copy and replaces it with another connection * Change to share underlying pointers. * Push up mutex changes * Post rebase * Formatting --------- Co-authored-by: KimLS <KimLS@peqtgc.com> Co-authored-by: Akkadius <akkadius1@gmail.com>
- Loading branch information
1 parent
bad631d
commit de2dfc1
Showing
12 changed files
with
162 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
#include <thread> | ||
#include "../../common/repositories/zone_repository.h" | ||
#include "../../common/eqemu_config.h" | ||
#include <signal.h> | ||
|
||
Database db; | ||
Database db2; | ||
|
||
volatile sig_atomic_t stop; | ||
void inthand(int signum) { | ||
stop = 1; | ||
} | ||
|
||
[[noreturn]] void DatabaseTest() | ||
{ | ||
while (true) { | ||
LogInfo("DatabaseTest Query"); | ||
db.QueryDatabase("SELECT 1"); | ||
} | ||
} | ||
|
||
[[noreturn]] void DatabaseTestSecondConnection() | ||
{ | ||
while (true) { | ||
LogInfo("DatabaseTest Query"); | ||
db2.QueryDatabase("SELECT 1"); | ||
} | ||
} | ||
|
||
|
||
void WorldserverCLI::TestDatabaseConcurrency(int argc, char **argv, argh::parser &cmd, std::string &description) | ||
{ | ||
description = "Test command to test database concurrency"; | ||
|
||
if (cmd[{"-h", "--help"}]) { | ||
return; | ||
} | ||
|
||
signal(SIGINT, inthand); | ||
|
||
LogInfo("Database test"); | ||
|
||
auto mutex = new Mutex; | ||
|
||
auto c = EQEmuConfig::get(); | ||
LogInfo("Connecting to MySQL"); | ||
if (!db.Connect( | ||
c->DatabaseHost.c_str(), | ||
c->DatabaseUsername.c_str(), | ||
c->DatabasePassword.c_str(), | ||
c->DatabaseDB.c_str(), | ||
c->DatabasePort | ||
)) { | ||
LogError("Cannot continue without a database connection"); | ||
return; | ||
} | ||
|
||
db.SetMutex(mutex); | ||
|
||
db2.SetMySQL(db); | ||
|
||
db2.SetMutex(mutex); | ||
|
||
std::thread(DatabaseTest).detach(); | ||
std::thread(DatabaseTest).detach(); | ||
std::thread(DatabaseTestSecondConnection).detach(); | ||
|
||
while (!stop) { | ||
|
||
} | ||
|
||
safe_delete(mutex); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.