Quellcode durchsuchen

Temporarily disable ConsoleServer

Daniele Bartolini vor 12 Jahren
Ursprung
Commit
870e9f1882
2 geänderte Dateien mit 36 neuen und 36 gelöschten Zeilen
  1. 34 34
      engine/ConsoleServer.cpp
  2. 2 2
      engine/ConsoleServer.h

+ 34 - 34
engine/ConsoleServer.cpp

@@ -40,90 +40,90 @@ static IntSetting g_port("read_port", "port used for reading", 10000, 9999, 6553
 
 //-----------------------------------------------------------------------------
 ConsoleServer::ConsoleServer() :
-	m_thread(ConsoleServer::background_thread, (void*)this, "console-thread"),
+	m_thread("console-thread"),
 	m_active(false)
 {
-	string::strncpy(m_cmd_buffer, "", 1024);
-	string::strncpy(m_err_buffer, "", 1024);
+	// string::strncpy(m_cmd_buffer, "", 1024);
+	// string::strncpy(m_err_buffer, "", 1024);
 }
 
 //-----------------------------------------------------------------------------
 void ConsoleServer::init()
 {
-	m_active = true;
+	// m_active = true;
 }
 
 //-----------------------------------------------------------------------------
 void ConsoleServer::shutdown()
 {
-	m_active = false;
+	// m_active = false;
 
-	m_socket.close();
+	// m_socket.close();
 }
 
 //-----------------------------------------------------------------------------
 void ConsoleServer::read_eval_loop()
 {
-	m_socket.open(g_port);
+	// m_socket.open(g_port);
 	
-	char cmd[1024];
+	// char cmd[1024];
 
-	while (m_active)
-	{
-		string::strncpy(cmd, "", 1024);
-		receive((char*)cmd, 1024);
+	// while (m_active)
+	// {
+	// 	string::strncpy(cmd, "", 1024);
+	// 	receive((char*)cmd, 1024);
 
-		// Fill command buffer
-		string::strncpy(m_cmd_buffer, cmd, 1024);
-	}
+	// 	// Fill command buffer
+	// 	string::strncpy(m_cmd_buffer, cmd, 1024);
+	// }
 
-	Log::i("End read-eval loop");
-	m_socket.close();
+	// Log::i("End read-eval loop");
+	// m_socket.close();
 }
 
 //-----------------------------------------------------------------------------
 void ConsoleServer::execute()
 {
-	m_command_mutex.lock();
+	// m_command_mutex.lock();
 
-	LuaEnvironment* lua = device()->lua_environment();
+	// LuaEnvironment* lua = device()->lua_environment();
 
-	lua->load_buffer(m_cmd_buffer, string::strlen(m_cmd_buffer));
-	lua->execute(0, 0);
+	// lua->load_buffer(m_cmd_buffer, string::strlen(m_cmd_buffer));
+	// lua->execute(0, 0);
 
-	string::strncpy(m_cmd_buffer, "", 1024);
+	// string::strncpy(m_cmd_buffer, "", 1024);
 
-	string::strncpy(m_err_buffer, lua->error(),  1024);
+	// string::strncpy(m_err_buffer, lua->error(),  1024);
 
-	if (string::strcmp(m_err_buffer, "") != 0)
-	{
-		// Fill error buffer
-		send((char*)m_err_buffer, 1024);
-	}
+	// if (string::strcmp(m_err_buffer, "") != 0)
+	// {
+	// 	// Fill error buffer
+	// 	send((char*)m_err_buffer, 1024);
+	// }
 
-	string::strncpy(m_err_buffer, "", 1024);
+	// string::strncpy(m_err_buffer, "", 1024);
 
-	m_command_mutex.unlock();
+	// m_command_mutex.unlock();
 }
 
 //-----------------------------------------------------------------------------
 void ConsoleServer::send(const void* data, size_t size)
 {
-	m_socket.send(data, size);
+	// m_socket.send(data, size);
 }
 
 //-----------------------------------------------------------------------------
 void ConsoleServer::receive(char* data, size_t size)
 {
-	m_socket.receive(data, size);
+	// m_socket.receive(data, size);
 }
 
 //-----------------------------------------------------------------------------
 void* ConsoleServer::background_thread(void* thiz)
 {
-	((ConsoleServer*)thiz)->read_eval_loop();
+	// ((ConsoleServer*)thiz)->read_eval_loop();
 
-	return NULL;
+	// return NULL;
 }
 
 

+ 2 - 2
engine/ConsoleServer.h

@@ -61,8 +61,8 @@ private:
 
 	os::TCPSocket			m_socket;
 
-	os::Thread				m_thread;
-	os::Mutex				m_command_mutex;
+	Thread					m_thread;
+	Mutex					m_command_mutex;
 
 	// Is console active?
 	bool					m_active;