Delete EventBuffer.h

engine/EventBuffer.h

@@ -1,106 +0,0 @@
-/*
-Copyright (c) 2013 Daniele Bartolini, Michele Rossi
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#pragma once
-
-#include <cstring>
-
-#include "OsTypes.h"
-
-#define EVENT_BUFFER_MAX_SIZE 1024 * 4
-
-namespace crown
-{
-
-struct EventBuffer
-{
-	char m_buffer[EVENT_BUFFER_MAX_SIZE];
-	
-	size_t m_size;
-	size_t m_read;
-
-	//-----------------------------------------------------------------------------
-	EventBuffer() 
-		: m_size(0), m_read(0)
-	{
-	}
-
-	//-----------------------------------------------------------------------------
-	void push_event(uint32_t event_type, void* event_data, size_t event_size)
-	{
-		if (m_size + sizeof(event_type) + sizeof(event_size) + event_size > EVENT_BUFFER_MAX_SIZE)
-		{
-			flush();
-		}
-
-		char* cur = m_buffer + m_size;
-
-		*(uint32_t*) cur = event_type;
-		*(size_t*) (cur + sizeof(event_type)) = event_size;
-		memcpy(cur + sizeof(event_type) + sizeof(event_size), event_data, event_size);
-
-		m_size += sizeof(event_type) + sizeof(event_size) + event_size;
-	}
-
-	//-----------------------------------------------------------------------------
-	void* get_next_event(uint32_t& event_type, size_t& event_size)
-	{
-		if (m_read < m_size)
-		{
-			char* cur = m_buffer + m_read;
-
-			// Saves type
-			event_type = *(uint32_t*) cur;
-			// Saves size
-			event_size = *(size_t*)(cur + sizeof(uint32_t));
-
-			// Set read to next event
-			m_read += sizeof(size_t) + sizeof(uint32_t) + event_size;
-
-			return cur + sizeof(size_t) + sizeof(uint32_t);
-		}
-
-		m_read = 0;
-
-		return NULL;
-	}
-
-	//-----------------------------------------------------------------------------
-	void clear()
-	{
-		m_size = 0;
-		m_read = 0;
-	}
-
-	//-----------------------------------------------------------------------------
-	void flush()
-	{
-		m_size = 0;
-		m_read = 0;
-	}
-};
-
-} // namespace crown

engine/tests/events.cpp

@@ -1,109 +1,111 @@
-#include <cstdlib>
-#include <ctime>
-
-#include "Crown.h"
-#include "EventBuffer.h"
-#include "OsTypes.h"
-#include "Mouse.h"
-#include "OsThread.h"
-#include "Log.h"
-
-using namespace crown;
-
-EventBuffer* g_write;
-EventBuffer* g_read;
-
-OsThread g_thread("consumer-thread");
-Semaphore g_write_sem;
-Semaphore g_read_sem;
-
-bool g_exit = false;
-
-//-----------------------------------------------------------------------------
-void push_event(int32_t x, int32_t y)
-{
-	OsMouseEvent ome;
-	ome.button = MouseButton::LEFT;
-	ome.x = x;
-	ome.y = y;
-	ome.pressed = true;
-
-	g_write->push_event((uint32_t)OsEvent::MOUSE, &ome, sizeof(OsMouseEvent));
-	Log::i("Event pushed");
-}
-
-//-----------------------------------------------------------------------------
-void swap()
-{
-	EventBuffer* tmp;
-
-	tmp = g_write;
-	g_write = g_read;
-	g_read = tmp;
-
-	Log::i("Buffers swapped");
-}
-
-//-----------------------------------------------------------------------------
-int32_t thread_proc(void* /*user_data*/)
-{
-	static uint32_t count = 0;
-
-	OsMouseEvent* result;
-	uint32_t et; size_t es;
-
-	while (true)
-	{
-		Log::i("%p", g_read);
+// #include <cstdlib>
+// #include <ctime>
+
+// #include "Crown.h"
+// #include "EventBuffer.h"
+// #include "OsTypes.h"
+// #include "Mouse.h"
+// #include "OsThread.h"
+// #include "Log.h"
+
+// using namespace crown;
+
+// EventBuffer* g_write;
+// EventBuffer* g_read;
+
+// OsThread g_thread("consumer-thread");
+// Semaphore g_write_sem;
+// Semaphore g_read_sem;
+
+// bool g_exit = false;
+
+// //-----------------------------------------------------------------------------
+// void push_event(int32_t x, int32_t y)
+// {
+// 	OsMouseEvent ome;
+// 	ome.button = MouseButton::LEFT;
+// 	ome.x = x;
+// 	ome.y = y;
+// 	ome.pressed = true;
+
+// 	g_write->push_event((uint32_t)OsEvent::MOUSE, &ome, sizeof(OsMouseEvent));
+// 	Log::i("Event pushed");
+// }
+
+// //-----------------------------------------------------------------------------
+// void swap()
+// {
+// 	EventBuffer* tmp;
+
+// 	tmp = g_write;
+// 	g_write = g_read;
+// 	g_read = tmp;
+
+// 	Log::i("Buffers swapped");
+// }
+
+// //-----------------------------------------------------------------------------
+// int32_t thread_proc(void* /*user_data*/)
+// {
+// 	static uint32_t count = 0;
+
+// 	OsMouseEvent* result;
+// 	uint32_t et; size_t es;
+
+// 	while (true)
+// 	{
+// 		Log::i("%p", g_read);
 		
-		do
-		{
-			result = (OsMouseEvent*)g_read->get_next_event(et, es);
+// 		do
+// 		{
+// 			result = (OsMouseEvent*)g_read->get_next_event(et, es);
 
-			if (result != NULL)
-			{
-				Log::d("x: %d, y: %d", result->x, result->y);
-			}
-		}
-		while (result != NULL);
+// 			if (result != NULL)
+// 			{
+// 				Log::d("x: %d, y: %d", result->x, result->y);
+// 			}
+// 		}
+// 		while (result != NULL);
 
-		g_exit = ++count == 3 ? true : false;
+// 		g_exit = ++count == 3 ? true : false;
 
-		g_read->clear();
+// 		g_read->clear();
 
-		g_write_sem.post();
-		g_read_sem.wait();
-	}
+// 		g_write_sem.post();
+// 		g_read_sem.wait();
+// 	}
 
-	return 0;
-}
+// 	return 0;
+// }
 
-//-----------------------------------------------------------------------------
-int main()
-{
-	memory::init();
+// //-----------------------------------------------------------------------------
+// int main()
+// {
+// 	memory::init();
 
-	g_write = CE_NEW(default_allocator(), EventBuffer);
-	g_read = CE_NEW(default_allocator(), EventBuffer);
+// 	g_write = CE_NEW(default_allocator(), EventBuffer);
+// 	g_read = CE_NEW(default_allocator(), EventBuffer);
 
-	g_thread.start(thread_proc);
+// 	g_thread.start(thread_proc);
 
-	while (!g_exit)
-	{
-		g_write_sem.wait();
+// 	while (!g_exit)
+// 	{
+// 		g_write_sem.wait();
 
-		push_event(10, 10);
-		push_event(20, 20);
-		push_event(30, 30);
+// 		push_event(10, 10);
+// 		push_event(20, 20);
+// 		push_event(30, 30);
 
-		swap();
+// 		swap();
 
-		g_read_sem.post();
-	}
+// 		g_read_sem.post();
+// 	}
 
-	g_thread.stop();
+// 	g_thread.stop();
 
-	memory::shutdown();
+// 	memory::shutdown();
 
-	return 0;
-}
+// 	return 0;
+// }
+
+int main() {}