Working working working on adding profiling, also switched to multi-threaded profiler (slower but need it).

common/database.cpp

@@ -1620,7 +1620,7 @@ uint32 Database::GetGroupID(const char* name){
 	if (results.RowCount() == 0)
 	{
 		// Commenting this out until logging levels can prevent this from going to console
-		//Log.Out(Logs::General, Logs::None,, "Character not in a group: %s", name);
+		//Log.Out(Logs::General, Logs::None, "Character not in a group: %s", name);
 		return 0;
 	}
 

common/eq_packet.cpp

@@ -39,9 +39,11 @@ EQPacket::EQPacket(EmuOpcode op, const unsigned char *buf, uint32 len)
 :	BasePacket(buf, len),
 	emu_opcode(op)
 {
+	_eqp_mt
 }
 
 void EQPacket::build_raw_header_dump(char *buffer, uint16 seq) const {
+	_eqp_mt
 	BasePacket::build_raw_header_dump(buffer, seq);
 	buffer += strlen(buffer);
 
@@ -50,17 +52,20 @@ void EQPacket::build_raw_header_dump(char *buffer, uint16 seq) const {
 
 void EQPacket::DumpRawHeader(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	char buff[196];
 	build_raw_header_dump(buff, seq);
 	fprintf(to, "%s", buff);
 }
 
 void EQPacket::build_header_dump(char *buffer) const {
+	_eqp_mt
 	sprintf(buffer, "[EmuOpCode 0x%04x Size=%u]", emu_opcode, size);
 }
 
 void EQPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	if (src_ip) {
 		std::string sIP,dIP;;
 		sIP=long2ip(src_ip);
@@ -75,6 +80,7 @@ void EQPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 
 void EQProtocolPacket::build_raw_header_dump(char *buffer, uint16 seq) const
 {
+	_eqp_mt
 	BasePacket::build_raw_header_dump(buffer, seq);
 	buffer += strlen(buffer);
 
@@ -83,6 +89,7 @@ void EQProtocolPacket::build_raw_header_dump(char *buffer, uint16 seq) const
 
 void EQProtocolPacket::DumpRawHeader(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	char buff[196];
 	build_raw_header_dump(buff, seq);
 	fprintf(to, "%s", buff);
@@ -90,11 +97,13 @@ void EQProtocolPacket::DumpRawHeader(uint16 seq, FILE *to) const
 
 void EQProtocolPacket::build_header_dump(char *buffer) const
 {
+	_eqp_mt
 	sprintf(buffer, "[ProtoOpCode 0x%04x Size=%u]",opcode,size);
 }
 
 void EQProtocolPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	if (src_ip) {
 		std::string sIP,dIP;;
 		sIP=long2ip(src_ip);
@@ -109,6 +118,7 @@ void EQProtocolPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 
 void EQApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) const
 {
+	_eqp_mt
 	BasePacket::build_raw_header_dump(buffer, seq);
 	buffer += strlen(buffer);
 
@@ -121,6 +131,7 @@ void EQApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) const
 
 void EQApplicationPacket::DumpRawHeader(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	char buff[196];
 	build_raw_header_dump(buff, seq);
 	fprintf(to, "%s", buff);
@@ -128,6 +139,7 @@ void EQApplicationPacket::DumpRawHeader(uint16 seq, FILE *to) const
 
 void EQApplicationPacket::build_header_dump(char *buffer) const
 {
+	_eqp_mt
 #ifdef STATIC_OPCODE
 	sprintf(buffer, "[OpCode 0x%04x Size=%u]\n", emu_opcode,size);
 #else
@@ -137,6 +149,7 @@ void EQApplicationPacket::build_header_dump(char *buffer) const
 
 void EQApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	if (src_ip) {
 		std::string sIP,dIP;;
 		sIP=long2ip(src_ip);
@@ -155,6 +168,7 @@ void EQApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 
 void EQRawApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) const
 {
+	_eqp_mt
 	BasePacket::build_raw_header_dump(buffer, seq);
 	buffer += strlen(buffer);
 
@@ -167,6 +181,7 @@ void EQRawApplicationPacket::build_raw_header_dump(char *buffer, uint16 seq) con
 
 void EQRawApplicationPacket::DumpRawHeader(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	char buff[196];
 	build_raw_header_dump(buff, seq);
 	fprintf(to, "%s", buff);
@@ -174,6 +189,7 @@ void EQRawApplicationPacket::DumpRawHeader(uint16 seq, FILE *to) const
 
 void EQRawApplicationPacket::build_header_dump(char *buffer) const
 {
+	_eqp_mt
 #ifdef STATIC_OPCODE
 	sprintf(buffer, "[OpCode 0x%04x (0x%04x) Size=%u]\n", emu_opcode, opcode,size);
 #else
@@ -183,6 +199,7 @@ void EQRawApplicationPacket::build_header_dump(char *buffer) const
 
 void EQRawApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 {
+	_eqp_mt
 	if (src_ip) {
 		std::string sIP,dIP;;
 		sIP=long2ip(src_ip);
@@ -201,6 +218,7 @@ void EQRawApplicationPacket::DumpRawHeaderNoTime(uint16 seq, FILE *to) const
 
 uint32 EQProtocolPacket::serialize(unsigned char *dest) const
 {
+	_eqp_mt
 	if (opcode>0xff) {
 		*(uint16 *)dest=opcode;
 	} else {
@@ -214,6 +232,7 @@ uint32 EQProtocolPacket::serialize(unsigned char *dest) const
 
 uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 {
+	_eqp_mt
 	uint8 OpCodeBytes = app_opcode_size;
 
 	if (app_opcode_size==1)
@@ -235,29 +254,10 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 	return size+OpCodeBytes;
 }
 
-/*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len)
-:	BasePacket(buf, len),
-	opcode(op)
-{
-
-uint32 offset;
-	opcode=ntohs(*(const uint16 *)buf);
-	offset=2;
-
-	if (len-offset) {
-		pBuffer= new unsigned char[len-offset];
-		memcpy(pBuffer,buf+offset,len-offset);
-		size=len-offset;
-	} else {
-		pBuffer=nullptr;
-		size=0;
-	}
-	OpMgr=&RawOpcodeManager;
-}*/
-
 bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
-bool result=false;
+	_eqp_mt
+	bool result=false;
 	if (opcode==OP_Combined && size+rhs->size+5<256) {
 		unsigned char *tmpbuffer=new unsigned char [size+rhs->size+3];
 		memcpy(tmpbuffer,pBuffer,size);
@@ -286,58 +286,10 @@ bool result=false;
 
 }
 
-/*
-this is the code to do app-layer combining, instead of protocol layer.
-this was taken out due to complex interactions with the opcode manager,
-and will require a bit more thinking (likely moving into EQStream) to
-get running again... but might be a good thing some day.
-
-bool EQApplicationPacket::combine(const EQApplicationPacket *rhs)
-{
-uint32 newsize=0, offset=0;
-unsigned char *tmpbuffer=nullptr;
-
-	if (opcode!=OP_AppCombined) {
-		newsize=app_opcode_size+size+(size>254?3:1)+app_opcode_size+rhs->size+(rhs->size>254?3:1);
-		tmpbuffer=new unsigned char [newsize];
-		offset=0;
-		if (size>254) {
-			tmpbuffer[offset++]=0xff;
-			*(uint16 *)(tmpbuffer+offset)=htons(size);
-			offset+=1;
-		} else {
-			tmpbuffer[offset++]=size;
-		}
-		offset+=serialize(tmpbuffer+offset);
-	} else {
-		newsize=size+app_opcode_size+rhs->size+(rhs->size>254?3:1);
-		tmpbuffer=new unsigned char [newsize];
-		memcpy(tmpbuffer,pBuffer,size);
-		offset=size;
-	}
-
-	if (rhs->size>254) {
-		tmpbuffer[offset++]=0xff;
-		*(uint16 *)(tmpbuffer+offset)=htons(rhs->size);
-		offset+=1;
-	} else {
-		tmpbuffer[offset++]=rhs->size;
-	}
-	offset+=rhs->serialize(tmpbuffer+offset);
-
-	size=offset;
-	opcode=OP_AppCombined;
-
-	delete[] pBuffer;
-	pBuffer=tmpbuffer;
-
-	return true;
-}
-*/
-
 bool EQProtocolPacket::ValidateCRC(const unsigned char *buffer, int length, uint32 Key)
 {
-bool valid=false;
+	_eqp_mt
+	bool valid=false;
 	// OP_SessionRequest, OP_SessionResponse, OP_OutOfSession are not CRC'd
 	if (buffer[0]==0x00 && (buffer[1]==OP_SessionRequest || buffer[1]==OP_SessionResponse || buffer[1]==OP_OutOfSession)) {
 		valid=true;
@@ -356,8 +308,9 @@ bool valid=false;
 
 uint32 EQProtocolPacket::Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize)
 {
-uint32 newlen=0;
-uint32 flag_offset=0;
+	_eqp_mt
+	uint32 newlen=0;
+	uint32 flag_offset=0;
 	newbuf[0]=buffer[0];
 	if (buffer[0]==0x00) {
 		flag_offset=2;
@@ -381,7 +334,8 @@ uint32 flag_offset=0;
 }
 
 uint32 EQProtocolPacket::Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize) {
-uint32 flag_offset=1,newlength;
+	_eqp_mt
+	uint32 flag_offset=1,newlength;
 	//dump_message_column(buffer,length,"Before: ");
 	newbuf[0]=buffer[0];
 	if (buffer[0]==0) {
@@ -404,6 +358,7 @@ uint32 flag_offset=1,newlength;
 
 void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey)
 {
+	_eqp_mt
 	if ((size >= 2) && buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
 		int Key=DecodeKey;
 		unsigned char *test=(unsigned char *)malloc(size);
@@ -429,6 +384,7 @@ void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey
 
 void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey)
 {
+	_eqp_mt
 	if (buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
 		int Key=EncodeKey;
 		char *test=(char*)malloc(size);
@@ -452,10 +408,12 @@ void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey
 }
 
 EQApplicationPacket *EQApplicationPacket::Copy() const {
+	_eqp_mt
 	return(new EQApplicationPacket(*this));
 }
 
 EQRawApplicationPacket *EQProtocolPacket::MakeAppPacket() const {
+	_eqp_mt
 	EQRawApplicationPacket *res = new EQRawApplicationPacket(opcode, pBuffer, size);
 	res->copyInfo(this);
 	return(res);
@@ -465,10 +423,12 @@ EQRawApplicationPacket::EQRawApplicationPacket(uint16 opcode, const unsigned cha
 :	EQApplicationPacket(OP_Unknown, buf, len),
 	opcode(opcode)
 {
+	_eqp_mt
 }
 EQRawApplicationPacket::EQRawApplicationPacket(const unsigned char *buf, const uint32 len)
 : EQApplicationPacket(OP_Unknown, buf+sizeof(uint16), len-sizeof(uint16))
 {
+	_eqp_mt
 	if(GetExecutablePlatform() != ExePlatformUCS) {
 		opcode = *((const uint16 *) buf);
 		if(opcode == 0x0000)
@@ -502,11 +462,11 @@ EQRawApplicationPacket::EQRawApplicationPacket(const unsigned char *buf, const u
 }
 
 void DumpPacket(const EQApplicationPacket* app, bool iShowInfo) {
+	_eqp_mt
 	if (iShowInfo) {
 		std::cout << "Dumping Applayer: 0x" << std::hex << std::setfill('0') << std::setw(4) << app->GetOpcode() << std::dec;
 		std::cout << " size:" << app->size << std::endl;
 	}
 	DumpPacketHex(app->pBuffer, app->size);
-//	DumpPacketAscii(app->pBuffer, app->size);
 }
 

common/eq_stream.cpp

@@ -49,6 +49,7 @@
 uint16 EQStream::MaxWindowSize=2048;
 
 void EQStream::init(bool resetSession) {
+	_eqp_mt
 	// we only reset these statistics if it is a 'new' connection
 	if ( resetSession )
 	{
@@ -91,6 +92,7 @@ void EQStream::init(bool resetSession) {
 
 EQRawApplicationPacket *EQStream::MakeApplicationPacket(EQProtocolPacket *p)
 {
+	_eqp_mt
 	EQRawApplicationPacket *ap=nullptr;
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Creating new application packet, length %d" __L, p->size);
 	// _raw(NET__APP_CREATE_HEX, 0xFFFF, p);
@@ -100,6 +102,7 @@ EQRawApplicationPacket *EQStream::MakeApplicationPacket(EQProtocolPacket *p)
 
 EQRawApplicationPacket *EQStream::MakeApplicationPacket(const unsigned char *buf, uint32 len)
 {
+	_eqp_mt
 	EQRawApplicationPacket *ap=nullptr;
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Creating new application packet, length %d" __L, len);
 	ap = new EQRawApplicationPacket(buf, len);
@@ -107,6 +110,7 @@ EQRawApplicationPacket *EQStream::MakeApplicationPacket(const unsigned char *buf
 }
 
 EQProtocolPacket *EQStream::MakeProtocolPacket(const unsigned char *buf, uint32 len) {
+	_eqp_mt
 	uint16 proto_opcode = ntohs(*(const uint16 *)buf);
 
 	//advance over opcode.
@@ -118,6 +122,7 @@ EQProtocolPacket *EQStream::MakeProtocolPacket(const unsigned char *buf, uint32
 
 void EQStream::ProcessPacket(EQProtocolPacket *p)
 {
+	_eqp_mt
 	uint32 processed=0, subpacket_length=0;
 	if (p == nullptr)
 		return;
@@ -515,6 +520,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 
 void EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req)
 {
+	_eqp_mt
 	if(p == nullptr)
 		return;
 
@@ -526,6 +532,7 @@ void EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req)
 
 void EQStream::FastQueuePacket(EQApplicationPacket **p, bool ack_req)
 {
+	_eqp_mt
 	EQApplicationPacket *pack=*p;
 	*p = nullptr;		//clear caller's pointer.. effectively takes ownership
 
@@ -555,6 +562,7 @@ void EQStream::FastQueuePacket(EQApplicationPacket **p, bool ack_req)
 
 void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 {
+	_eqp_mt
 	uint32 chunksize,used;
 	uint32 length;
 
@@ -599,6 +607,7 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 
 void EQStream::SequencedPush(EQProtocolPacket *p)
 {
+	_eqp_mt
 #ifdef COLLECTOR
 	delete p;
 #else
@@ -627,6 +636,7 @@ if(NextSequencedSend > SequencedQueue.size()) {
 
 void EQStream::NonSequencedPush(EQProtocolPacket *p)
 {
+	_eqp_mt
 #ifdef COLLECTOR
 	delete p;
 #else
@@ -639,7 +649,8 @@ void EQStream::NonSequencedPush(EQProtocolPacket *p)
 
 void EQStream::SendAck(uint16 seq)
 {
-uint16 Seq=htons(seq);
+	_eqp_mt
+	uint16 Seq=htons(seq);
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Sending ack with sequence %d" __L, seq);
 	SetLastAckSent(seq);
 	NonSequencedPush(new EQProtocolPacket(OP_Ack,(unsigned char *)&Seq,sizeof(uint16)));
@@ -647,6 +658,7 @@ uint16 Seq=htons(seq);
 
 void EQStream::SendOutOfOrderAck(uint16 seq)
 {
+	_eqp_mt
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Sending out of order ack with sequence %d" __L, seq);
 uint16 Seq=htons(seq);
 	NonSequencedPush(new EQProtocolPacket(OP_OutOfOrderAck,(unsigned char *)&Seq,sizeof(uint16)));
@@ -654,6 +666,7 @@ uint16 Seq=htons(seq);
 
 void EQStream::Write(int eq_fd)
 {
+	_eqp_mt
 	std::queue<EQProtocolPacket *> ReadyToSend;
 	bool SeqEmpty=false, NonSeqEmpty=false;
 	std::deque<EQProtocolPacket *>::iterator sitr;
@@ -849,8 +862,9 @@ void EQStream::Write(int eq_fd)
 
 void EQStream::WritePacket(int eq_fd, EQProtocolPacket *p)
 {
-uint32 length;
-sockaddr_in address;
+	_eqp_mt
+	uint32 length;
+	sockaddr_in address;
 	address.sin_family = AF_INET;
 	address.sin_addr.s_addr=remote_ip;
 	address.sin_port=remote_port;
@@ -887,7 +901,8 @@ sockaddr_in address;
 
 void EQStream::SendSessionResponse()
 {
-EQProtocolPacket *out=new EQProtocolPacket(OP_SessionResponse,nullptr,sizeof(SessionResponse));
+	_eqp_mt
+	EQProtocolPacket *out=new EQProtocolPacket(OP_SessionResponse,nullptr,sizeof(SessionResponse));
 	SessionResponse *Response=(SessionResponse *)out->pBuffer;
 	Response->Session=htonl(Session);
 	Response->MaxLength=htonl(MaxLen);
@@ -909,7 +924,8 @@ EQProtocolPacket *out=new EQProtocolPacket(OP_SessionResponse,nullptr,sizeof(Ses
 
 void EQStream::SendSessionRequest()
 {
-EQProtocolPacket *out=new EQProtocolPacket(OP_SessionRequest,nullptr,sizeof(SessionRequest));
+	_eqp_mt
+	EQProtocolPacket *out=new EQProtocolPacket(OP_SessionRequest,nullptr,sizeof(SessionRequest));
 	SessionRequest *Request=(SessionRequest *)out->pBuffer;
 	memset(Request,0,sizeof(SessionRequest));
 	Request->Session=htonl(time(nullptr));
@@ -922,6 +938,7 @@ EQProtocolPacket *out=new EQProtocolPacket(OP_SessionRequest,nullptr,sizeof(Sess
 
 void EQStream::_SendDisconnect()
 {
+	_eqp_mt
 	if(GetState() == CLOSED)
 		return;
 
@@ -934,6 +951,7 @@ void EQStream::_SendDisconnect()
 
 void EQStream::InboundQueuePush(EQRawApplicationPacket *p)
 {
+	_eqp_mt
 	MInboundQueue.lock();
 	InboundQueue.push_back(p);
 	MInboundQueue.unlock();
@@ -941,7 +959,8 @@ void EQStream::InboundQueuePush(EQRawApplicationPacket *p)
 
 EQApplicationPacket *EQStream::PopPacket()
 {
-EQRawApplicationPacket *p=nullptr;
+	_eqp_mt
+	EQRawApplicationPacket *p=nullptr;
 
 	MInboundQueue.lock();
 	if (InboundQueue.size()) {
@@ -968,7 +987,8 @@ EQRawApplicationPacket *p=nullptr;
 
 EQRawApplicationPacket *EQStream::PopRawPacket()
 {
-EQRawApplicationPacket *p=nullptr;
+	_eqp_mt
+	EQRawApplicationPacket *p=nullptr;
 
 	MInboundQueue.lock();
 	if (InboundQueue.size()) {
@@ -995,7 +1015,8 @@ EQRawApplicationPacket *p=nullptr;
 
 EQRawApplicationPacket *EQStream::PeekPacket()
 {
-EQRawApplicationPacket *p=nullptr;
+	_eqp_mt
+	EQRawApplicationPacket *p=nullptr;
 
 	MInboundQueue.lock();
 	if (InboundQueue.size()) {
@@ -1009,7 +1030,8 @@ EQRawApplicationPacket *p=nullptr;
 
 void EQStream::InboundQueueClear()
 {
-EQApplicationPacket *p=nullptr;
+	_eqp_mt
+	EQApplicationPacket *p=nullptr;
 
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Clearing inbound queue" __L);
 
@@ -1027,7 +1049,8 @@ EQApplicationPacket *p=nullptr;
 
 bool EQStream::HasOutgoingData()
 {
-bool flag;
+	_eqp_mt
+	bool flag;
 
 	//once closed, we have nothing more to say
 	if(CheckClosed())
@@ -1052,7 +1075,8 @@ bool flag;
 
 void EQStream::OutboundQueueClear()
 {
-EQProtocolPacket *p=nullptr;
+	_eqp_mt
+	EQProtocolPacket *p=nullptr;
 
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Clearing outbound queue" __L);
 
@@ -1074,7 +1098,8 @@ EQProtocolPacket *p=nullptr;
 
 void EQStream::PacketQueueClear()
 {
-EQProtocolPacket *p=nullptr;
+	_eqp_mt
+	EQProtocolPacket *p=nullptr;
 
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Clearing future packet queue" __L);
 
@@ -1090,8 +1115,9 @@ EQProtocolPacket *p=nullptr;
 
 void EQStream::Process(const unsigned char *buffer, const uint32 length)
 {
-static unsigned char newbuffer[2048];
-uint32 newlength=0;
+	_eqp_mt
+	static unsigned char newbuffer[2048];
+	uint32 newlength=0;
 	if (EQProtocolPacket::ValidateCRC(buffer,length,Key)) {
 		if (compressed) {
 			newlength=EQProtocolPacket::Decompress(buffer,length,newbuffer,2048);
@@ -1114,6 +1140,7 @@ uint32 newlength=0;
 
 long EQStream::GetNextAckToSend()
 {
+	_eqp_mt
 	MAcks.lock();
 	long l=NextAckToSend;
 	MAcks.unlock();
@@ -1123,6 +1150,7 @@ long EQStream::GetNextAckToSend()
 
 long EQStream::GetLastAckSent()
 {
+	_eqp_mt
 	MAcks.lock();
 	long l=LastAckSent;
 	MAcks.unlock();
@@ -1132,16 +1160,17 @@ long EQStream::GetLastAckSent()
 
 void EQStream::AckPackets(uint16 seq)
 {
-std::deque<EQProtocolPacket *>::iterator itr, tmp;
+	_eqp_mt
+	std::deque<EQProtocolPacket *>::iterator itr, tmp;
 
 	MOutboundQueue.lock();
-//do a bit of sanity checking.
-if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Ack Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
-}
-if(NextSequencedSend > SequencedQueue.size()) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-}
+	//do a bit of sanity checking.
+	if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
+		Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Ack Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
+	}
+	if(NextSequencedSend > SequencedQueue.size()) {
+		Log.Out(Logs::Detail, Logs::Netcode, _L "Pre-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
+	}
 
 	SeqOrder ord = CompareSequence(SequencedBase, seq);
 	if(ord == SeqInOrder) {
@@ -1157,12 +1186,12 @@ if(NextSequencedSend > SequencedQueue.size()) {
 		//this is a good ack, we get to ack some blocks.
 		seq++;	//we stop at the block right after their ack, counting on the wrap of both numbers.
 		while(SequencedBase != seq) {
-if(SequencedQueue.empty()) {
-Log.Out(Logs::Detail, Logs::Netcode, _L "OUT OF PACKETS acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, NextSequencedSend);
-	SequencedBase = NextOutSeq;
-	NextSequencedSend = 0;
-	break;
-}
+			if(SequencedQueue.empty()) {
+			Log.Out(Logs::Detail, Logs::Netcode, _L "OUT OF PACKETS acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, NextSequencedSend);
+				SequencedBase = NextOutSeq;
+				NextSequencedSend = 0;
+				break;
+			}
 			Log.Out(Logs::Detail, Logs::Netcode, _L "Removing acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, NextSequencedSend);
 			//clean out the acked packet
 			delete SequencedQueue.front();
@@ -1173,12 +1202,12 @@ Log.Out(Logs::Detail, Logs::Netcode, _L "OUT OF PACKETS acked packet with sequen
 			//advance the base sequence number to the seq of the block after the one we just got rid of.
 			SequencedBase++;
 		}
-if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack on %d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, seq, SequencedBase, SequencedQueue.size(), NextOutSeq);
-}
-if(NextSequencedSend > SequencedQueue.size()) {
-	Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
-}
+		if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
+			Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack on %d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, seq, SequencedBase, SequencedQueue.size(), NextOutSeq);
+		}
+		if(NextSequencedSend > SequencedQueue.size()) {
+			Log.Out(Logs::Detail, Logs::Netcode, _L "Post-Ack Next Send Sequence is beyond the end of the queue NSS %d > SQ %d" __L, NextSequencedSend, SequencedQueue.size());
+		}
 	}
 
 	MOutboundQueue.unlock();
@@ -1186,6 +1215,7 @@ if(NextSequencedSend > SequencedQueue.size()) {
 
 void EQStream::SetNextAckToSend(uint32 seq)
 {
+	_eqp_mt
 	MAcks.lock();
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Set Next Ack To Send to %lu" __L, (unsigned long)seq);
 	NextAckToSend=seq;
@@ -1194,6 +1224,7 @@ void EQStream::SetNextAckToSend(uint32 seq)
 
 void EQStream::SetLastAckSent(uint32 seq)
 {
+	_eqp_mt
 	MAcks.lock();
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Set Last Ack Sent to %lu" __L, (unsigned long)seq);
 	LastAckSent=seq;
@@ -1202,6 +1233,7 @@ void EQStream::SetLastAckSent(uint32 seq)
 
 void EQStream::ProcessQueue()
 {
+	_eqp_mt
 	if(PacketQueue.empty()) {
 		return;
 	}
@@ -1217,8 +1249,9 @@ void EQStream::ProcessQueue()
 
 EQProtocolPacket *EQStream::RemoveQueue(uint16 seq)
 {
-std::map<unsigned short,EQProtocolPacket *>::iterator itr;
-EQProtocolPacket *qp=nullptr;
+	_eqp_mt
+	std::map<unsigned short,EQProtocolPacket *>::iterator itr;
+	EQProtocolPacket *qp=nullptr;
 	if ((itr=PacketQueue.find(seq))!=PacketQueue.end()) {
 		qp=itr->second;
 		PacketQueue.erase(itr);
@@ -1229,6 +1262,7 @@ EQProtocolPacket *qp=nullptr;
 
 void EQStream::SetStreamType(EQStreamType type)
 {
+	_eqp_mt
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Changing stream type from %s to %s" __L, StreamTypeString(StreamType), StreamTypeString(type));
 	StreamType=type;
 	switch (StreamType) {
@@ -1259,6 +1293,7 @@ void EQStream::SetStreamType(EQStreamType type)
 
 const char *EQStream::StreamTypeString(EQStreamType t)
 {
+	_eqp_mt
 	switch (t) {
 		case LoginStream:
 			return "Login";
@@ -1288,6 +1323,7 @@ const char *EQStream::StreamTypeString(EQStreamType t)
 //returns SeqFuture if `seq` is later than `expected_seq`
 EQStream::SeqOrder EQStream::CompareSequence(uint16 expected_seq , uint16 seq)
 {
+	_eqp_mt
 	if (expected_seq==seq) {
 		// Curent
 		return SeqInOrder;
@@ -1301,6 +1337,7 @@ EQStream::SeqOrder EQStream::CompareSequence(uint16 expected_seq , uint16 seq)
 }
 
 void EQStream::SetState(EQStreamState state) {
+	_eqp_mt
 	MState.lock();
 	Log.Out(Logs::Detail, Logs::Netcode, _L "Changing state from %d to %d" __L, State, state);
 	State=state;
@@ -1309,7 +1346,7 @@ void EQStream::SetState(EQStreamState state) {
 
 
 void EQStream::CheckTimeout(uint32 now, uint32 timeout) {
-
+	_eqp_mt
 	bool outgoing_data = HasOutgoingData();	//up here to avoid recursive locking
 
 	EQStreamState orig_state = GetState();
@@ -1348,6 +1385,7 @@ void EQStream::CheckTimeout(uint32 now, uint32 timeout) {
 
 void EQStream::Decay()
 {
+	_eqp_mt
 	MRate.lock();
 	uint32 rate=DecayRate;
 	MRate.unlock();
@@ -1360,6 +1398,7 @@ void EQStream::Decay()
 
 void EQStream::AdjustRates(uint32 average_delta)
 {
+	_eqp_mt
 	if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
 		if (average_delta && (average_delta <= AVERAGE_DELTA_MAX)) {
 			MRate.lock();
@@ -1385,6 +1424,7 @@ void EQStream::AdjustRates(uint32 average_delta)
 }
 
 void EQStream::Close() {
+	_eqp_mt
 	if(HasOutgoingData()) {
 		//there is pending data, wait for it to go out.
 		Log.Out(Logs::Detail, Logs::Netcode, _L "Stream requested to Close(), but there is pending data, waiting for it." __L);
@@ -1401,6 +1441,7 @@ void EQStream::Close() {
 //this could be expanded to check more than the fitst opcode if
 //we needed more complex matching
 EQStream::MatchState EQStream::CheckSignature(const Signature *sig) {
+	_eqp_mt
 	EQRawApplicationPacket *p = nullptr;
 	MatchState res = MatchNotReady;
 

common/eq_stream_factory.cpp

@@ -23,7 +23,7 @@
 
 ThreadReturnType EQStreamFactoryReaderLoop(void *eqfs)
 {
-EQStreamFactory *fs=(EQStreamFactory *)eqfs;
+	EQStreamFactory *fs = (EQStreamFactory*)eqfs;
 
 #ifndef WIN32
 	Log.Out(Logs::Detail, Logs::None,  "Starting EQStreamFactoryReaderLoop with thread ID %d", pthread_self());
@@ -40,7 +40,7 @@ EQStreamFactory *fs=(EQStreamFactory *)eqfs;
 
 ThreadReturnType EQStreamFactoryWriterLoop(void *eqfs)
 {
-	EQStreamFactory *fs=(EQStreamFactory *)eqfs;
+	EQStreamFactory *fs = (EQStreamFactory*)eqfs;
 
 #ifndef WIN32
 	Log.Out(Logs::Detail, Logs::None,  "Starting EQStreamFactoryWriterLoop with thread ID %d", pthread_self());
@@ -65,6 +65,7 @@ EQStreamFactory::EQStreamFactory(EQStreamType type, int port, uint32 timeout)
 
 void EQStreamFactory::Close()
 {
+	_eqp_mt
 	Stop();
 
 #ifdef _WINDOWS
@@ -77,7 +78,8 @@ void EQStreamFactory::Close()
 
 bool EQStreamFactory::Open()
 {
-struct sockaddr_in address;
+	_eqp_mt
+	struct sockaddr_in address;
 #ifndef WIN32
 	pthread_t t1,t2;
 #endif
@@ -118,6 +120,7 @@ struct sockaddr_in address;
 
 std::shared_ptr<EQStream> EQStreamFactory::Pop()
 {
+	_eqp_mt
 	std::shared_ptr<EQStream> s = nullptr;
 	MNewStreams.lock();
 	if (NewStreams.size()) {
@@ -132,6 +135,7 @@ std::shared_ptr<EQStream> EQStreamFactory::Pop()
 
 void EQStreamFactory::Push(std::shared_ptr<EQStream> s)
 {
+	_eqp_mt
 	MNewStreams.lock();
 	NewStreams.push(s);
 	MNewStreams.unlock();
@@ -216,6 +220,7 @@ void EQStreamFactory::ReaderLoop()
 
 void EQStreamFactory::CheckTimeout()
 {
+	_eqp_mt
 	//lock streams the entire time were checking timeouts, it should be fast.
 	MStreams.lock();
 

common/eqemu_logsys.cpp

@@ -89,6 +89,7 @@ EQEmuLogSys::~EQEmuLogSys()
 
 void EQEmuLogSys::LoadLogSettingsDefaults()
 {
+	_eqp_mt
 	/* Get Executable platform currently running this code (Zone/World/etc) */
 	log_platform = GetExecutablePlatformInt();
 
@@ -96,6 +97,7 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	memset(log_settings, 0, sizeof(LogSettings) * Logs::LogCategory::MaxCategoryID);
 
 	/* Set Defaults */
+	log_settings[Logs::LoginServer].log_to_console = Logs::General;
 	log_settings[Logs::World_Server].log_to_console = Logs::General;
 	log_settings[Logs::Zone_Server].log_to_console = Logs::General;
 	log_settings[Logs::QS_Server].log_to_console = Logs::General;
@@ -116,12 +118,13 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 		platform_file_name = "ucs";
 	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLogin)
 		platform_file_name = "login";
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLogin)
+	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLaunch)
 		platform_file_name = "launcher";
 }
 
 std::string EQEmuLogSys::FormatOutMessageString(uint16 log_category, const std::string &in_message)
 {
+	_eqp_mt
 	std::string category_string;
 	if (log_category > 0 && Logs::LogCategoryName[log_category])
 		category_string = StringFormat("[%s] ", Logs::LogCategoryName[log_category]);
@@ -130,6 +133,7 @@ std::string EQEmuLogSys::FormatOutMessageString(uint16 log_category, const std::
 
 void EQEmuLogSys::ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message)
 {
+	_eqp_mt
 	/* Check if category enabled for process */
 	if (log_settings[log_category].log_to_gmsay == 0)
 		return;
@@ -149,6 +153,7 @@ void EQEmuLogSys::ProcessGMSay(uint16 debug_level, uint16 log_category, const st
 
 void EQEmuLogSys::ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message)
 {
+	_eqp_mt
 	if (log_category == Logs::Crash) {
 		char time_stamp[80];
 		EQEmuLogSys::SetCurrentTimeStamp(time_stamp);
@@ -175,6 +180,7 @@ void EQEmuLogSys::ProcessLogWrite(uint16 debug_level, uint16 log_category, const
 }
 
 uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category) {
+	_eqp_mt
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
@@ -198,6 +204,7 @@ uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category) {
 }
 
 std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category) {
+	_eqp_mt
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
@@ -221,6 +228,7 @@ std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category) {
 }
 
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category) {
+	_eqp_mt
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
@@ -245,6 +253,7 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category) {
 
 void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message)
 {
+	_eqp_mt
 	/* Check if category enabled for process */
 	if (log_settings[log_category].log_to_console == 0)
 		return;
@@ -272,6 +281,7 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category,
 
 void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...)
 {
+	_eqp_mt
 	const bool log_to_console = log_settings[log_category].log_to_console > 0;
 	const bool log_to_file = log_settings[log_category].log_to_file > 0;
 	const bool log_to_gmsay = log_settings[log_category].log_to_gmsay > 0;
@@ -293,6 +303,7 @@ void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::st
 
 void EQEmuLogSys::SetCurrentTimeStamp(char* time_stamp)
 {
+	_eqp_mt
 	time_t raw_time;
 	struct tm * time_info;
 	time(&raw_time);
@@ -302,6 +313,7 @@ void EQEmuLogSys::SetCurrentTimeStamp(char* time_stamp)
 
 void EQEmuLogSys::MakeDirectory(const std::string &directory_name)
 {
+	_eqp_mt
 #ifdef _WINDOWS
 	struct _stat st;
 	if (_stat(directory_name.c_str(), &st) == 0) // exists
@@ -317,6 +329,7 @@ void EQEmuLogSys::MakeDirectory(const std::string &directory_name)
 
 void EQEmuLogSys::CloseFileLogs()
 {
+	_eqp_mt
 	if (process_log.is_open()) {
 		process_log.close();
 	}
@@ -324,6 +337,7 @@ void EQEmuLogSys::CloseFileLogs()
 
 void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 {
+	_eqp_mt
 	EQEmuLogSys::CloseFileLogs();
 
 	/* When loading settings, we must have been given a reason in category based logging to output to a file in order to even create or open one... */

common/eqemu_logsys.h

@@ -48,12 +48,14 @@ namespace Logs {
 		Combat,
 		Commands,
 		Crash,
+		Database,
 		Debug,
 		Doors,
 		Error,
 		Guilds,
 		Inventory,
 		Launcher,
+		LoginServer,
 		Netcode,
 		Normal,
 		Object,
@@ -92,12 +94,14 @@ namespace Logs {
 		"Combat",
 		"Commands",
 		"Crash",
+		"Database",
 		"Debug",
 		"Doors",
 		"Error",
 		"Guilds",
 		"Inventory",
 		"Launcher",
+		"LoginServer",
 		"Netcode",
 		"Normal",
 		"Object",
@@ -118,10 +122,10 @@ namespace Logs {
 		"WebInterface Server",
 		"World Server",
 		"Zone Server",
-		"MySQL Error",
-		"MySQL Query",
+		"MySQLError",
+		"MySQLQuery",
 		"Mercenaries",
-		"Quest Debug"
+		"QuestDebug"
 	};
 }
 

common/timeoutmgr.cpp

@@ -43,7 +43,7 @@ void TimeoutManager::CheckTimeouts() {
 		Timeoutable *it = *cur;
 		if(it->next_check.Check()) {
 #ifdef TIMEOUT_DEBUG
-			Log.Out(Logs::General, Logs::None,, "Checking timeout on 0x%x\n", it);
+			Log.Out(Logs::General, Logs::None, "Checking timeout on 0x%x\n", it);
 #endif
 			it->CheckTimeout();
 		}
@@ -58,13 +58,13 @@ void TimeoutManager::AddMember(Timeoutable *who) {
 	DeleteMember(who);	//just in case... prolly not needed.
 	members.push_back(who);
 #ifdef TIMEOUT_DEBUG
-	Log.Out(Logs::General, Logs::None,, "Adding timeoutable 0x%x\n", who);
+	Log.Out(Logs::General, Logs::None, "Adding timeoutable 0x%x\n", who);
 #endif
 }
 
 void TimeoutManager::DeleteMember(Timeoutable *who) {
 #ifdef TIMEOUT_DEBUG
-	Log.Out(Logs::General, Logs::None,, "Removing timeoutable 0x%x\n", who);
+	Log.Out(Logs::General, Logs::None, "Removing timeoutable 0x%x\n", who);
 #endif
 	std::vector<Timeoutable *>::iterator cur,end;
 	cur = members.begin();