OSDN Git Service

ソケット通信からスクリプトを実行する機能を追加
authorh2so5 <h2so5@git.sourceforge.jp>
Tue, 16 Oct 2012 01:11:43 +0000 (10:11 +0900)
committerh2so5 <h2so5@git.sourceforge.jp>
Tue, 16 Oct 2012 01:11:43 +0000 (10:11 +0900)
TLSFによるメモリ管理を一部実装

24 files changed:
client/Card.cpp
client/Card.hpp
client/ManagerAccessor.cpp
client/ManagerAccessor.hpp
client/ManagerHeader.hpp
client/Player.hpp
client/ResourceManager.cpp
client/ResourceManager.hpp
client/ScriptEnvironment.cpp
client/ScriptEnvironment.hpp
client/SocketServerManager.cpp [new file with mode: 0644]
client/SocketServerManager.hpp [new file with mode: 0644]
client/main.cpp
client/scene/ChannelChange.cpp
client/scene/Connect.cpp
client/scene/MainLoop.cpp
client/scene/MainLoop.hpp
client/stdafx.h
client/tlsf.cpp [new file with mode: 0644]
client/tlsf.h [new file with mode: 0644]
client/tlsfbits.h [new file with mode: 0644]
client/ui/UISuper.hpp
package.py
server/Server.cpp

index be89e46..7f884ea 100644 (file)
 #include "GenerateJSON.hpp"\r
 #include "Music.hpp"\r
 \r
-#pragma comment(lib,"libctemplate.lib")\r
+//#pragma comment(lib,"libctemplate.lib")\r
 \r
-#define CTEMPLATE_DLL_DECL\r
-#include <config.h>\r
-#include <ctemplate/template.h>\r
+//#define CTEMPLATE_DLL_DECL\r
+//#include <config.h>\r
+//#include <ctemplate/template.h>\r
 \r
 \r
 char Card::STORAGE_DIR[] = "storage";\r
@@ -83,6 +83,7 @@ Card::Card(
         context->Global()->Set(String::New("Music"),  script_object->Clone());\r
         context->Global()->Set(String::New("Plugin"),  script_object->Clone());\r
         context->Global()->Set(String::New("InputBox"),   script_object->Clone());\r
+        context->Global()->Set(String::New("Socket"),    script_object->Clone());\r
         context->Global()->Set(String::New("Card"),    script_object->Clone());\r
         context->Global()->Set(String::New("Screen"),  script_object->Clone());\r
         context->Global()->Set(String::New("UI"),      script_object->Clone());\r
@@ -563,7 +564,18 @@ Handle<Value> Card::Function_Music_Rebuild(const Arguments& args)
        return Undefined();\r
 }\r
 \r
+Handle<Value> Card::Function_Socket_reply(const Arguments& args)\r
+{\r
+       if (args.Length() > 0 && args[0]->IsString()) {\r
+               std::string str = *String::Utf8Value(args[0]->ToString());\r
+               auto self = static_cast<Card*>(args.Holder()->GetPointerFromInternalField(0));\r
+               if (self && self->on_socket_reply_) {\r
+                       (*self->on_socket_reply_)(str);\r
+               }\r
+       }\r
 \r
+       return Undefined();\r
+}\r
 \r
 Handle<Value> Card::Property_global(Local<String> property, const AccessorInfo &info)\r
 {\r
@@ -1056,6 +1068,14 @@ void Card::SetFunctions()
     script_.SetFunction("Account.updateChannel", Function_Account_updateChannel);\r
 \r
     /**\r
+     * ソケット\r
+     *\r
+     * @class Socket\r
+     * @static\r
+     */\r
+       script_.SetFunction("Socket.reply", Function_Socket_reply);\r
+\r
+    /**\r
      * カード\r
      *\r
      * @class Card\r
@@ -1736,4 +1756,9 @@ void Card::set_max_local_storage_size(int size)
 void Card::set_ui_board(const UISuperPtr& ui_board)\r
 {\r
        ui_board_ = ui_board;\r
+}\r
+\r
+void Card::set_on_socket_reply(const SocketCallbackPtr& func)\r
+{\r
+       on_socket_reply_ = func;\r
 }
\ No newline at end of file
index b5357b2..47d745f 100644 (file)
Binary files a/client/Card.hpp and b/client/Card.hpp differ
index f31983d..bbac5c5 100644 (file)
@@ -86,3 +86,13 @@ void ManagerAccessor::set_window_manager(WindowManagerWeakPtr window_manager)
 {
     window_manager_ = window_manager;
 }
+
+const SocketServerManagerWeakPtr& ManagerAccessor::socket_server_manager()
+{
+    return socket_server_manager_;
+}
+
+void ManagerAccessor::set_socket_server_manager(SocketServerManagerWeakPtr socket_server_manager)
+{
+    socket_server_manager_ = socket_server_manager;
+}
\ No newline at end of file
index 3c56fda..9f40efd 100644 (file)
@@ -27,6 +27,8 @@ class ManagerAccessor {
         void set_config_manager(ConfigManagerWeakPtr config_manager);
         const WindowManagerWeakPtr& window_manager();
         void set_window_manager(WindowManagerWeakPtr window_manager);
+           const SocketServerManagerWeakPtr& socket_server_manager();
+        void set_socket_server_manager(SocketServerManagerWeakPtr socket_server_manager);
 
     private:
         CardManagerWeakPtr card_manager_;
@@ -36,6 +38,7 @@ class ManagerAccessor {
         AccountManagerWeakPtr account_manager_;
         ConfigManagerWeakPtr config_manager_;
         WindowManagerWeakPtr window_manager_;
+               SocketServerManagerWeakPtr socket_server_manager_;
 };
 
 typedef std::shared_ptr<ManagerAccessor> ManagerAccessorPtr;
index e44941d..6e71598 100644 (file)
@@ -34,4 +34,8 @@ typedef std::weak_ptr<ConfigManager> ConfigManagerWeakPtr;
 
 class WindowManager;
 typedef std::shared_ptr<WindowManager> WindowManagerPtr;
-typedef std::weak_ptr<WindowManager> WindowManagerWeakPtr;
\ No newline at end of file
+typedef std::weak_ptr<WindowManager> WindowManagerWeakPtr;
+
+class SocketServerManager;
+typedef std::shared_ptr<SocketServerManager> SocketServerManagerPtr;
+typedef std::weak_ptr<SocketServerManager> SocketServerManagerWeakPtr;
\ No newline at end of file
index ed6d2b2..b5b67da 100644 (file)
@@ -110,6 +110,17 @@ class Player : public std::enable_shared_from_this<Player> {
         std::string ip_address_;
         uint16_t udp_port_;
 
+       public:
+               void *operator new(size_t size)
+               {
+                       return tlsf_new(ResourceManager::memory_pool(), size);
+               }
+               void *operator new(size_t, void *p){return p;}
+               void operator delete(void *p)
+               {
+                       tlsf_delete(ResourceManager::memory_pool(), p);
+               }
+               void operator delete(void *, void *){};
 
     private:
         const static int BALLOON_BASE_BLOCK_SIZE;
index 19aeb88..901d260 100644 (file)
Binary files a/client/ResourceManager.cpp and b/client/ResourceManager.cpp differ
index 3050b73..6f7fd60 100644 (file)
@@ -35,10 +35,34 @@ struct ReadFuncData {
 typedef std::shared_ptr<ReadFuncData> ReadFuncDataPtr;
 
 class ResourceManager {
+       private:
+               static class MemoryPool {
+                       private:
+                               char mem_block_[1024*1024*512];
+                               tlsf_pool pool_;
+                       public:
+                               MemoryPool()
+                               {
+                                       pool_ = tlsf_create(mem_block_,sizeof(mem_block_));
+                               }
+
+                               ~MemoryPool()
+                               {
+                                       tlsf_destroy(pool_);
+                               }
+
+                               tlsf_pool& pool()
+                               {
+                                       return pool_;
+                               }
+               } mempool;
 
     public:
         static void ClearCache();
 
+    public:
+        static tlsf_pool& memory_pool();
+
     // Fonts
     public:
         static int default_font_handle();
@@ -115,6 +139,19 @@ class ImageHandle {
 
     private:
         int handle_;
+
+       public:
+               void *operator new(size_t size)
+               {
+                       return tlsf_new(ResourceManager::memory_pool(), size);
+               }
+               void *operator new(size_t, void *p){return p;}
+               void operator delete(void *p)
+               {
+                       tlsf_delete(ResourceManager::memory_pool(), p);
+               }
+               void operator delete(void *, void *){};
+
 };
 
 class ModelHandle {
@@ -142,4 +179,17 @@ class ModelHandle {
         std::shared_ptr<ptree> property_;
         std::string name_;
         bool async_load_;
+
+       public:
+               void *operator new(size_t size)
+               {
+                       return tlsf_new(ResourceManager::memory_pool(), size);
+               }
+               void *operator new(size_t, void *p){return p;}
+               void operator delete(void *p)
+               {
+                       tlsf_delete(ResourceManager::memory_pool(), p);
+               }
+               void operator delete(void *, void *){};
+
 };
index a953902..e75fd35 100644 (file)
Binary files a/client/ScriptEnvironment.cpp and b/client/ScriptEnvironment.cpp differ
index 1575c91..741168a 100644 (file)
@@ -10,6 +10,7 @@
 #include <v8.h>
 #include <boost/thread.hpp>
 #include <boost/timer.hpp>
+#include "ResourceManager.hpp"
 
 using namespace v8;
 typedef std::function<void(const Handle<Value>&, const std::string)> V8ValueCallBack;
@@ -93,6 +94,18 @@ class ScriptEnvironment {
 
         static unsigned int max_execution_time;
         static char SCRIPT_PATH[];
+
+       public:
+               void *operator new(size_t size)
+               {
+                       return tlsf_new(ResourceManager::memory_pool(), size);
+               }
+               void *operator new(size_t, void *p){return p;}
+               void operator delete(void *p)
+               {
+                       tlsf_delete(ResourceManager::memory_pool(), p);
+               }
+               void operator delete(void *, void *){};
 };
 
 typedef std::shared_ptr<ScriptEnvironment> ScriptEnvironmentPtr;
diff --git a/client/SocketServerManager.cpp b/client/SocketServerManager.cpp
new file mode 100644 (file)
index 0000000..5bbfb3b
--- /dev/null
@@ -0,0 +1,119 @@
+//
+// SocketServerManager.cpp
+//
+
+#include "SocketServerManager.hpp"
+#include "CardManager.hpp"
+
+const char SocketServerManager::DELIMITOR = 0x03;
+
+SocketServerManager::SocketServerManager(const ManagerAccessorPtr& manager_accessor) :
+       manager_accessor_(manager_accessor),
+       acceptor_(io_service_, tcp::endpoint(tcp::v4(), 39340))
+{
+
+}
+
+void SocketServerManager::Start()
+{
+    auto new_session = boost::make_shared<Session>(manager_accessor_, io_service_);
+    acceptor_.async_accept(new_session->socket(),
+        boost::bind(&SocketServerManager::ReceiveSession, this, new_session,
+          boost::asio::placeholders::error));
+
+       boost::thread t([this](){
+        try {
+            io_service_.run();
+        } catch (std::exception& e) {
+            std::cout << e.what() << std::endl;
+        }
+       });
+}
+
+void SocketServerManager::ReceiveSession(const SessionPtr& session, const boost::system::error_code& error)
+{
+               
+       if(!error) {
+        session->Start();
+    }
+
+    auto new_session = boost::make_shared<Session>(manager_accessor_, io_service_);
+    acceptor_.async_accept(new_session->socket(),
+        boost::bind(&SocketServerManager::ReceiveSession, this, new_session,
+          boost::asio::placeholders::error));
+
+}
+
+SocketServerManager::Session::Session(const ManagerAccessorPtr& manager_accessor, boost::asio::io_service& io_service) :
+
+       socket_(io_service),
+       card_(std::make_shared<Card>(manager_accessor, "", "sock", "",
+                            std::vector<std::string>()))
+{
+       auto callback = std::make_shared<std::function<void(const std::string&)>>(
+               [this](const std::string& str){
+                       boost::asio::write(socket_, boost::asio::buffer(str.data(), str.size()));
+               });
+       card_->set_on_socket_reply(callback);
+
+    if (auto card_manager = manager_accessor->card_manager().lock()) {
+        card_manager->AddCard(card_);
+    }
+}
+
+void SocketServerManager::Session::Start()
+{
+    boost::asio::async_read_until(socket_,
+        receive_buf_, DELIMITOR,
+            boost::bind(&SocketServerManager::Session::ReceiveTCP, shared_from_this(),
+              boost::asio::placeholders::error));
+}
+
+void SocketServerManager::Session::ReceiveTCP(const boost::system::error_code& error)
+{
+    if (!error) {
+        std::string buffer(boost::asio::buffer_cast<const char*>(receive_buf_.data()),receive_buf_.size());
+        auto length = buffer.find_last_of(DELIMITOR);
+
+        if (length != std::string::npos) {
+
+            receive_buf_.consume(length + 1);
+            buffer.erase(length + 1);
+
+            while (!buffer.empty()) {
+                std::string msg;
+
+                while (!buffer.empty() && buffer[0]!=DELIMITOR)
+                {
+                    msg += buffer[0];
+                    buffer.erase(0,1);
+                }
+                buffer.erase(0,1);
+
+                               Logger::Debug(_T("Receive command: %d"), unicode::ToTString(msg));
+                               card_->Execute(msg, "", 
+                                       [this](const Handle<Value>& value, const std::string error){
+                                               if (!error.empty()) {
+                                                       std::string return_str(error);
+                                                       return_str += DELIMITOR;
+                                                       boost::asio::write(socket_, boost::asio::buffer(return_str.data(), return_str.size()));
+                                               }
+                                       });
+            }
+
+                       boost::asio::async_read_until(socket_,
+                               receive_buf_, DELIMITOR,
+                                       boost::bind(&SocketServerManager::Session::ReceiveTCP, shared_from_this(),
+                                         boost::asio::placeholders::error));
+
+        }
+
+    } else {
+
+    }
+}
+
+tcp::socket& SocketServerManager::Session::socket()
+{
+       return socket_;
+}
\ No newline at end of file
diff --git a/client/SocketServerManager.hpp b/client/SocketServerManager.hpp
new file mode 100644 (file)
index 0000000..fe887fe
--- /dev/null
@@ -0,0 +1,45 @@
+//
+// SocketServerManager.hpp
+//
+
+#pragma once
+
+#include "ManagerAccessor.hpp"
+#include <boost/asio.hpp>
+#include "Card.hpp"
+
+using namespace boost::asio::ip;
+
+class SocketServerManager {
+       public:
+               class Session : public boost::enable_shared_from_this<Session> {
+                       public:
+                               Session(const ManagerAccessorPtr& manager_accessor, boost::asio::io_service& io_service);
+                               void Start();
+                               tcp::socket& socket();
+
+                       private:
+                               void ReceiveTCP(const boost::system::error_code& error);
+
+                       private:
+                               CardPtr card_;
+                               tcp::socket socket_;
+                               boost::asio::streambuf receive_buf_;
+               };
+               typedef boost::shared_ptr<Session> SessionPtr;
+
+       public:
+               SocketServerManager(const ManagerAccessorPtr& manager_accessor = ManagerAccessorPtr());
+               void Start();
+               void ReceiveSession(const SessionPtr& session, const boost::system::error_code& error);
+
+       private:
+               ManagerAccessorPtr manager_accessor_;
+
+               boost::asio::io_service io_service_;
+               tcp::acceptor acceptor_;
+
+               static const char DELIMITOR;
+};
+typedef std::shared_ptr<SocketServerManager> SocketServerManagerPtr;
+typedef std::weak_ptr<SocketServerManager> SocketServerManagerWeakPtr;
\ No newline at end of file
index 27738ad..e813a5a 100644 (file)
@@ -4,13 +4,14 @@
 
 #include <Windows.h>
 #include <tchar.h>
-#include "Core.hpp"
 #include <crtdbg.h>
+#include "tlsf.h"
+#include "Core.hpp"
 
 int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
     // _CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF);
-
-    Core core;
-    return core.Run();
+       
+       Core core;
+       return core.Run();
 }
index 46e9251..ab05caa 100644 (file)
@@ -4,6 +4,7 @@
 
 #include "MainLoop.hpp"
 #include "ChannelChange.hpp"
+#include "../CommandManager.hpp"
 #include "../../common/Logger.hpp"
 #include "../../common/network/Utils.hpp"
 #include "../3d/Stage.hpp"
index a92e7bf..9caf504 100644 (file)
@@ -10,6 +10,8 @@
 #include <algorithm>
 #include "../ResourceManager.hpp"
 #include "../PlayerManager.hpp"
+#include "../CommandManager.hpp"
+#include "../AccountManager.hpp"
 #include "../../common/Logger.hpp"
 
 namespace scene {
index 36c56a0..032f0d7 100644 (file)
@@ -8,8 +8,15 @@
 #include "ChannelChange.hpp"
 #include <vector>
 #include <algorithm>
+#include "../PlayerManager.hpp"
+#include "../CardManager.hpp"
+#include "../CommandManager.hpp"
+#include "../WorldManager.hpp"
+#include "../AccountManager.hpp"
+#include "../ConfigManager.hpp"
 #include "../ResourceManager.hpp"
 #include "../WindowManager.hpp"
+#include "../SocketServerManager.hpp"
 #include "../Core.hpp"
 #include <shlwapi.h>
 #include "ServerChange.hpp"
@@ -25,6 +32,7 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
       account_manager_(manager_accessor->account_manager().lock()),
       config_manager_(manager_accessor->config_manager().lock()),
       window_manager_(std::make_shared<WindowManager>(manager_accessor_)),
+         socket_server_manager_(std::make_shared<SocketServerManager>(manager_accessor_)),
       inputbox_(std::make_shared<InputBox>(manager_accessor_)),
          minimap_(std::make_shared<MiniMap>(manager_accessor)),
          snapshot_number_(0),
@@ -45,6 +53,8 @@ MainLoop::MainLoop(const ManagerAccessorPtr& manager_accessor) :
     world_manager_->Init();    
 
     world_manager_->myself()->Init(unicode::ToTString(account_manager_->model_name()));
+
+       socket_server_manager_->Start();
 }
 
 MainLoop::~MainLoop()
index 93a5e0f..e8b3506 100644 (file)
@@ -7,15 +7,10 @@
 #include <memory>
 #include "Base.hpp"
 #include "../Client.hpp"
-#include "../PlayerManager.hpp"
-#include "../CardManager.hpp"
-#include "../CommandManager.hpp"
-#include "../WorldManager.hpp"
-#include "../AccountManager.hpp"
-#include "../ConfigManager.hpp"
 #include "../ManagerAccessor.hpp"
 #include "../ui/InputBox.hpp"
 #include "../MiniMap.hpp"
+//#include "../SocketServer.hpp"
 
 namespace scene {
 
@@ -43,11 +38,14 @@ class MainLoop : public Base {
         AccountManagerPtr account_manager_;
         ConfigManagerPtr config_manager_;
         WindowManagerPtr window_manager_;
+        SocketServerManagerPtr socket_server_manager_;
                MiniMapPtr minimap_;
         InputBoxPtr inputbox_;
-               int snapshot_number_;
 
+               int snapshot_number_;
                bool snapshot_;
+
+               //SocketServer socket_server_;
 };
 
 }
index 03f5c58..234ec3b 100644 (file)
@@ -80,4 +80,6 @@
 #include <boost/serialization/string.hpp>
 
 #include "../common/Logger.hpp"
-#include "Language.hpp"
\ No newline at end of file
+#include "Language.hpp"
+
+#include "tlsf.h"
\ No newline at end of file
diff --git a/client/tlsf.cpp b/client/tlsf.cpp
new file mode 100644 (file)
index 0000000..53d8ace
--- /dev/null
@@ -0,0 +1,971 @@
+#include "stdafx.h"
+
+#include "tlsf.h"
+#include "tlsfbits.h"
+
+/*
+** Constants.
+*/
+
+/* Public constants: may be modified. */
+enum tlsf_public
+{
+       /* log2 of number of linear subdivisions of block sizes. */
+       SL_INDEX_COUNT_LOG2 = 5,
+};
+
+/* Private constants: do not modify. */
+enum tlsf_private
+{
+#if defined (TLSF_64BIT)
+       /* All allocation sizes and addresses are aligned to 8 bytes. */
+       ALIGN_SIZE_LOG2 = 3,
+#else
+       /* All allocation sizes and addresses are alig  ned to 4 bytes. */
+       ALIGN_SIZE_LOG2 = 2,
+#endif
+       ALIGN_SIZE = (1 << ALIGN_SIZE_LOG2),
+
+       /*
+       ** We support allocations of sizes up to (1 << FL_INDEX_MAX) bits.
+       ** However, because we linearly subdivide the second-level lists, and
+       ** our minimum size granularity is 4 bytes, it doesn't make sense to
+       ** create first-level lists for sizes smaller than SL_INDEX_COUNT * 4,
+       ** or (1 << (SL_INDEX_COUNT_LOG2 + 2)) bytes, as there we will be
+       ** trying to split size ranges into more slots than we have available.
+       ** Instead, we calculate the minimum threshold size, and place all
+       ** blocks below that size into the 0th first-level list.
+       */
+
+#if defined (TLSF_64BIT)
+       /*
+       ** TODO: We can increase this to support larger sizes, at the expense
+       ** of more overhead in the TLSF structure.
+       */
+       FL_INDEX_MAX = 32,
+#else
+       FL_INDEX_MAX = 30,
+#endif
+       SL_INDEX_COUNT = (1 << SL_INDEX_COUNT_LOG2),
+       FL_INDEX_SHIFT = (SL_INDEX_COUNT_LOG2 + ALIGN_SIZE_LOG2),
+       FL_INDEX_COUNT = (FL_INDEX_MAX - FL_INDEX_SHIFT + 1),
+
+       SMALL_BLOCK_SIZE = (1 << FL_INDEX_SHIFT),
+};
+
+/*
+** Cast and min/max macros.
+*/
+
+#define tlsf_cast(t, exp)      ((t) (exp))
+#define tlsf_min(a, b)         ((a) < (b) ? (a) : (b))
+#define tlsf_max(a, b)         ((a) > (b) ? (a) : (b))
+
+/*
+** Set assert macro, if it has not been provided by the user.
+*/
+#if !defined (tlsf_assert)
+#define tlsf_assert _ASSERTE
+#endif
+
+/*
+** Static assertion mechanism.
+*/
+
+#define _tlsf_glue2(x, y) x ## y
+#define _tlsf_glue(x, y) _tlsf_glue2(x, y)
+#define tlsf_static_assert(exp) \
+       typedef char _tlsf_glue(static_assert, __LINE__) [(exp) ? 1 : -1]
+
+/* This code has been tested on 32- and 64-bit (LP/LLP) architectures. */
+tlsf_static_assert(sizeof(int) * CHAR_BIT == 32);
+tlsf_static_assert(sizeof(size_t) * CHAR_BIT >= 32);
+tlsf_static_assert(sizeof(size_t) * CHAR_BIT <= 64);
+
+/* SL_INDEX_COUNT must be <= number of bits in sl_bitmap's storage type. */
+tlsf_static_assert(sizeof(unsigned int) * CHAR_BIT >= SL_INDEX_COUNT);
+
+/* Ensure we've properly tuned our sizes. */
+tlsf_static_assert(ALIGN_SIZE == SMALL_BLOCK_SIZE / SL_INDEX_COUNT);
+
+/*
+** Data structures and associated constants.
+*/
+
+/*
+** Block header structure.
+**
+** There are several implementation subtleties involved:
+** - The prev_phys_block field is only valid if the previous block is free.
+** - The prev_phys_block field is actually stored at the end of the
+**   previous block. It appears at the beginning of this structure only to
+**   simplify the implementation.
+** - The next_free / prev_free fields are only valid if the block is free.
+*/
+typedef struct block_header_t
+{
+       /* Points to the previous physical block. */
+       struct block_header_t* prev_phys_block;
+
+       /* The size of this block, excluding the block header. */
+       size_t size;
+
+       /* Next and previous free blocks. */
+       struct block_header_t* next_free;
+       struct block_header_t* prev_free;
+} block_header_t;
+
+/*
+** Since block sizes are always at least a multiple of 4, the two least
+** significant bits of the size field are used to store the block status:
+** - bit 0: whether block is busy or free
+** - bit 1: whether previous block is busy or free
+*/
+static const size_t block_header_free_bit = 1 << 0;
+static const size_t block_header_prev_free_bit = 1 << 1;
+
+/*
+** The size of the block header exposed to used blocks is the size field.
+** The prev_phys_block field is stored *inside* the previous free block.
+*/
+static const size_t block_header_overhead = sizeof(size_t);
+
+/* User data starts directly after the size field in a used block. */
+static const size_t block_start_offset =
+       offsetof(block_header_t, size) + sizeof(size_t);
+
+/*
+** A free block must be large enough to store its header minus the size of
+** the prev_phys_block field, and no larger than the number of addressable
+** bits for FL_INDEX.
+*/
+static const size_t block_size_min = 
+       sizeof(block_header_t) - sizeof(block_header_t*);
+static const size_t block_size_max = tlsf_cast(size_t, 1) << FL_INDEX_MAX;
+
+
+/* The TLSF pool structure. */
+typedef struct pool_t
+{
+       /* Empty lists point at this block to indicate they are free. */
+       block_header_t block_null;
+
+       /* Bitmaps for free lists. */
+       unsigned int fl_bitmap;
+       unsigned int sl_bitmap[FL_INDEX_COUNT];
+
+       /* Head of free lists. */
+       block_header_t* blocks[FL_INDEX_COUNT][SL_INDEX_COUNT];
+} pool_t;
+
+/* A type used for casting when doing pointer arithmetic. */
+typedef ptrdiff_t tlsfptr_t;
+
+/*
+** block_header_t member functions.
+*/
+
+static size_t block_size(const block_header_t* block)
+{
+       return block->size & ~(block_header_free_bit | block_header_prev_free_bit);
+}
+
+static void block_set_size(block_header_t* block, size_t size)
+{
+       const size_t oldsize = block->size;
+       block->size = size | (oldsize & (block_header_free_bit | block_header_prev_free_bit));
+}
+
+static int block_is_last(const block_header_t* block)
+{
+       return 0 == block_size(block);
+}
+
+static int block_is_free(const block_header_t* block)
+{
+       return tlsf_cast(int, block->size & block_header_free_bit);
+}
+
+static void block_set_free(block_header_t* block)
+{
+       block->size |= block_header_free_bit;
+}
+
+static void block_set_used(block_header_t* block)
+{
+       block->size &= ~block_header_free_bit;
+}
+
+static int block_is_prev_free(const block_header_t* block)
+{
+       return tlsf_cast(int, block->size & block_header_prev_free_bit);
+}
+
+static void block_set_prev_free(block_header_t* block)
+{
+       block->size |= block_header_prev_free_bit;
+}
+
+static void block_set_prev_used(block_header_t* block)
+{
+       block->size &= ~block_header_prev_free_bit;
+}
+
+static block_header_t* block_from_ptr(const void* ptr)
+{
+       return tlsf_cast(block_header_t*,
+               tlsf_cast(unsigned char*, ptr) - block_start_offset);
+}
+
+static void* block_to_ptr(const block_header_t* block)
+{
+       return tlsf_cast(void*,
+               tlsf_cast(unsigned char*, block) + block_start_offset);
+}
+
+/* Return location of next block after block of given size. */
+static block_header_t* offset_to_block(const void* ptr, size_t size)
+{
+       return tlsf_cast(block_header_t*, tlsf_cast(tlsfptr_t, ptr) + size);
+}
+
+/* Return location of previous block. */
+static block_header_t* block_prev(const block_header_t* block)
+{
+       return block->prev_phys_block;
+}
+
+/* Return location of next existing block. */
+static block_header_t* block_next(const block_header_t* block)
+{
+       block_header_t* next = offset_to_block(block_to_ptr(block),
+               block_size(block) - block_header_overhead);
+       tlsf_assert(!block_is_last(block));
+       return next;
+}
+
+/* Link a new block with its physical neighbor, return the neighbor. */
+static block_header_t* block_link_next(block_header_t* block)
+{
+       block_header_t* next = block_next(block);
+       next->prev_phys_block = block;
+       return next;
+}
+
+static void block_mark_as_free(block_header_t* block)
+{
+       /* Link the block to the next block, first. */
+       block_header_t* next = block_link_next(block);
+       block_set_prev_free(next);
+       block_set_free(block);
+}
+
+static void block_mark_as_used(block_header_t* block)
+{
+       block_header_t* next = block_next(block);
+       block_set_prev_used(next);
+       block_set_used(block);
+}
+
+static size_t align_up(size_t x, size_t align)
+{
+       tlsf_assert(0 == (align & (align - 1)) && "must align to a power of two");
+       return (x + (align - 1)) & ~(align - 1);
+}
+
+static size_t align_down(size_t x, size_t align)
+{
+       tlsf_assert(0 == (align & (align - 1)) && "must align to a power of two");
+       return x - (x & (align - 1));
+}
+
+static void* align_ptr(const void* ptr, size_t align)
+{
+       const tlsfptr_t aligned =
+               (tlsf_cast(tlsfptr_t, ptr) + (align - 1)) & ~(align - 1);
+       tlsf_assert(0 == (align & (align - 1)) && "must align to a power of two");
+       return tlsf_cast(void*, aligned);
+}
+
+/*
+** Adjust an allocation size to be aligned to word size, and no smaller
+** than internal minimum.
+*/
+static size_t adjust_request_size(size_t size, size_t align)
+{
+       size_t adjust = 0;
+       if (size && size < block_size_max)
+       {
+               const size_t aligned = align_up(size, align);
+               adjust = tlsf_max(aligned, block_size_min);
+       }
+       return adjust;
+}
+
+/*
+** TLSF utility functions. In most cases, these are direct translations of
+** the documentation found in the white paper.
+*/
+
+static void mapping_insert(size_t size, int* fli, int* sli)
+{
+       int fl, sl;
+       if (size < SMALL_BLOCK_SIZE)
+       {
+               /* Store small blocks in first list. */
+               fl = 0;
+               sl = tlsf_cast(int, size) / (SMALL_BLOCK_SIZE / SL_INDEX_COUNT);
+       }
+       else
+       {
+               fl = tlsf_fls_sizet(size);
+               sl = tlsf_cast(int, size >> (fl - SL_INDEX_COUNT_LOG2)) ^ (1 << SL_INDEX_COUNT_LOG2);
+               fl -= (FL_INDEX_SHIFT - 1);
+       }
+       *fli = fl;
+       *sli = sl;
+}
+
+/* This version rounds up to the next block size (for allocations) */
+static void mapping_search(size_t size, int* fli, int* sli)
+{
+       if (size >= (1 << SL_INDEX_COUNT_LOG2))
+       {
+               const size_t round = (1 << (tlsf_fls_sizet(size) - SL_INDEX_COUNT_LOG2)) - 1;
+               size += round;
+       }
+       mapping_insert(size, fli, sli);
+}
+
+static block_header_t* search_suitable_block(pool_t* pool, int* fli, int* sli)
+{
+       int fl = *fli;
+       int sl = *sli;
+
+       /*
+       ** First, search for a block in the list associated with the given
+       ** fl/sl index.
+       */
+       unsigned int sl_map = pool->sl_bitmap[fl] & (~0 << sl);
+       if (!sl_map)
+       {
+               /* No block exists. Search in the next largest first-level list. */
+               const unsigned int fl_map = pool->fl_bitmap & (~0 << (fl + 1));
+               if (!fl_map)
+               {
+                       /* No free blocks available, memory has been exhausted. */
+                       return 0;
+               }
+
+               fl = tlsf_ffs(fl_map);
+               *fli = fl;
+               sl_map = pool->sl_bitmap[fl];
+       }
+       tlsf_assert(sl_map && "internal error - second level bitmap is null");
+       sl = tlsf_ffs(sl_map);
+       *sli = sl;
+
+       /* Return the first block in the free list. */
+       return pool->blocks[fl][sl];
+}
+
+/* Remove a free block from the free list.*/
+static void remove_free_block(pool_t* pool, block_header_t* block, int fl, int sl)
+{
+       block_header_t* prev = block->prev_free;
+       block_header_t* next = block->next_free;
+       tlsf_assert(prev && "prev_free field can not be null");
+       tlsf_assert(next && "next_free field can not be null");
+       next->prev_free = prev;
+       prev->next_free = next;
+
+       /* If this block is the head of the free list, set new head. */
+       if (pool->blocks[fl][sl] == block)
+       {
+               pool->blocks[fl][sl] = next;
+
+               /* If the new head is null, clear the bitmap. */
+               if (next == &pool->block_null)
+               {
+                       pool->sl_bitmap[fl] &= ~(1 << sl);
+
+                       /* If the second bitmap is now empty, clear the fl bitmap. */
+                       if (!pool->sl_bitmap[fl])
+                       {
+                               pool->fl_bitmap &= ~(1 << fl);
+                       }
+               }
+       }
+}
+
+/* Insert a free block into the free block list. */
+static void insert_free_block(pool_t* pool, block_header_t* block, int fl, int sl)
+{
+       block_header_t* current = pool->blocks[fl][sl];
+       tlsf_assert(current && "free list cannot have a null entry");
+       tlsf_assert(block && "cannot insert a null entry into the free list");
+       block->next_free = current;
+       block->prev_free = &pool->block_null;
+       current->prev_free = block;
+
+       tlsf_assert(block_to_ptr(block) == align_ptr(block_to_ptr(block), ALIGN_SIZE)
+               && "block not aligned properly");
+       /*
+       ** Insert the new block at the head of the list, and mark the first-
+       ** and second-level bitmaps appropriately.
+       */
+       pool->blocks[fl][sl] = block;
+       pool->fl_bitmap |= (1 << fl);
+       pool->sl_bitmap[fl] |= (1 << sl);
+}
+
+/* Remove a given block from the free list. */
+static void block_remove(pool_t* pool, block_header_t* block)
+{
+       int fl, sl;
+       mapping_insert(block_size(block), &fl, &sl);
+       remove_free_block(pool, block, fl, sl);
+}
+
+/* Insert a given block into the free list. */
+static void block_insert(pool_t* pool, block_header_t* block)
+{
+       int fl, sl;
+       mapping_insert(block_size(block), &fl, &sl);
+       insert_free_block(pool, block, fl, sl);
+}
+
+static int block_can_split(block_header_t* block, size_t size)
+{
+       return block_size(block) >= sizeof(block_header_t) + size;
+}
+
+/* Split a block into two, the second of which is free. */
+static block_header_t* block_split(block_header_t* block, size_t size)
+{
+       /* Calculate the amount of space left in the remaining block. */
+       block_header_t* remaining =
+               offset_to_block(block_to_ptr(block), size - block_header_overhead);
+
+       const size_t remain_size = block_size(block) - (size + block_header_overhead);
+
+       tlsf_assert(block_to_ptr(remaining) == align_ptr(block_to_ptr(remaining), ALIGN_SIZE)
+               && "remaining block not aligned properly");
+
+       tlsf_assert(block_size(block) == remain_size + size + block_header_overhead);
+       block_set_size(remaining, remain_size);
+       tlsf_assert(block_size(remaining) >= block_size_min && "block split with invalid size");
+
+       block_set_size(block, size);
+       block_mark_as_free(remaining);
+
+       return remaining;
+}
+
+/* Absorb a free block's storage into an adjacent previous free block. */
+static block_header_t* block_absorb(block_header_t* prev, block_header_t* block)
+{
+       tlsf_assert(!block_is_last(prev) && "previous block can't be last!");
+       /* Note: Leaves flags untouched. */
+       prev->size += block_size(block) + block_header_overhead;
+       block_link_next(prev);
+       return prev;
+}
+
+/* Merge a just-freed block with an adjacent previous free block. */
+static block_header_t* block_merge_prev(pool_t* pool, block_header_t* block)
+{
+       if (block_is_prev_free(block))
+       {
+               block_header_t* prev = block_prev(block);
+               tlsf_assert(prev && "prev physical block can't be null");
+               tlsf_assert(block_is_free(prev) && "prev block is not free though marked as such");
+               block_remove(pool, prev);
+               block = block_absorb(prev, block);
+       }
+
+       return block;
+}
+
+/* Merge a just-freed block with an adjacent free block. */
+static block_header_t* block_merge_next(pool_t* pool, block_header_t* block)
+{
+       block_header_t* next = block_next(block);
+       tlsf_assert(next && "next physical block can't be null");
+
+       if (block_is_free(next))
+       {
+               tlsf_assert(!block_is_last(block) && "previous block can't be last!");
+               block_remove(pool, next);
+               block = block_absorb(block, next);
+       }
+
+       return block;
+}
+
+/* Trim any trailing block space off the end of a block, return to pool. */
+static void block_trim_free(pool_t* pool, block_header_t* block, size_t size)
+{
+       tlsf_assert(block_is_free(block) && "block must be free");
+       if (block_can_split(block, size))
+       {
+               block_header_t* remaining_block = block_split(block, size);
+               block_link_next(block);
+               block_set_prev_free(remaining_block);
+               block_insert(pool, remaining_block);
+       }
+}
+
+/* Trim any trailing block space off the end of a used block, return to pool. */
+static void block_trim_used(pool_t* pool, block_header_t* block, size_t size)
+{
+       tlsf_assert(!block_is_free(block) && "block must be used");
+       if (block_can_split(block, size))
+       {
+               /* If the next block is free, we must coalesce. */
+               block_header_t* remaining_block = block_split(block, size);
+               block_set_prev_used(remaining_block);
+
+               remaining_block = block_merge_next(pool, remaining_block);
+               block_insert(pool, remaining_block);
+       }
+}
+
+static block_header_t* block_trim_free_leading(pool_t* pool, block_header_t* block, size_t size)
+{
+       block_header_t* remaining_block = block;
+       if (block_can_split(block, size))
+       {
+               /* We want the 2nd block. */
+               remaining_block = block_split(block, size - block_header_overhead);
+               block_set_prev_free(remaining_block);
+
+               block_link_next(block);
+               block_insert(pool, block);
+       }
+
+       return remaining_block;
+}
+
+static block_header_t* block_locate_free(pool_t* pool, size_t size)
+{
+       int fl = 0, sl = 0;
+       block_header_t* block = 0;
+
+       if (size)
+       {
+               mapping_search(size, &fl, &sl);
+               block = search_suitable_block(pool, &fl, &sl);
+       }
+
+       if (block)
+       {
+               tlsf_assert(block_size(block) >= size);
+               remove_free_block(pool, block, fl, sl);
+       }
+
+       return block;
+}
+
+static void* block_prepare_used(pool_t* pool, block_header_t* block, size_t size)
+{
+       void* p = 0;
+       if (block)
+       {
+               block_trim_free(pool, block, size);
+               block_mark_as_used(block);
+               p = block_to_ptr(block);
+       }
+       return p;
+}
+
+/* Clear structure and point all empty lists at the null block. */
+static void pool_construct(pool_t* pool)
+{
+       int i, j;
+
+       pool->block_null.next_free = &pool->block_null;
+       pool->block_null.prev_free = &pool->block_null;
+
+       pool->fl_bitmap = 0;
+       for (i = 0; i < FL_INDEX_COUNT; ++i)
+       {
+               pool->sl_bitmap[i] = 0;
+               for (j = 0; j < SL_INDEX_COUNT; ++j)
+               {
+                       pool->blocks[i][j] = &pool->block_null;
+               }
+       }
+}
+
+/*
+** Debugging utilities.
+*/
+
+typedef struct integrity_t
+{
+       int prev_status;
+       int status;
+} integrity_t;
+
+#define tlsf_insist(x) { tlsf_assert(x); if (!(x)) { status--; } }
+
+static void integrity_walker(void* ptr, size_t size, int used, void* user)
+{
+       block_header_t* block = block_from_ptr(ptr);
+       integrity_t* integ = tlsf_cast(integrity_t*, user);
+       const int this_prev_status = block_is_prev_free(block) ? 1 : 0;
+       const int this_status = block_is_free(block) ? 1 : 0;
+       const size_t this_block_size = block_size(block);
+
+       int status = 0;
+       tlsf_insist(integ->prev_status == this_prev_status && "prev status incorrect");
+       tlsf_insist(size == this_block_size && "block size incorrect");
+
+       integ->prev_status = this_status;
+       integ->status += status;
+}
+
+int tlsf_check_heap(tlsf_pool tlsf)
+{
+       int i, j;
+
+       pool_t* pool = tlsf_cast(pool_t*, tlsf);
+       int status = 0;
+
+       /* Check that the blocks are physically correct. */
+       integrity_t integ = { 0, 0 };
+       tlsf_walk_heap(tlsf, integrity_walker, &integ);
+       status = integ.status;
+
+       /* Check that the free lists and bitmaps are accurate. */
+       for (i = 0; i < FL_INDEX_COUNT; ++i)
+       {
+               for (j = 0; j < SL_INDEX_COUNT; ++j)
+               {
+                       const int fl_map = pool->fl_bitmap & (1 << i);
+                       const int sl_list = pool->sl_bitmap[i];
+                       const int sl_map = sl_list & (1 << j);
+                       const block_header_t* block = pool->blocks[i][j];
+
+                       /* Check that first- and second-level lists agree. */
+                       if (!fl_map)
+                       {
+                               tlsf_insist(!sl_map && "second-level map must be null");
+                       }
+
+                       if (!sl_map)
+                       {
+                               tlsf_insist(block == &pool->block_null && "block list must be null");
+                               continue;
+                       }
+
+                       /* Check that there is at least one free block. */
+                       tlsf_insist(sl_list && "no free blocks in second-level map");
+                       tlsf_insist(block != &pool->block_null && "block should not be null");
+
+                       while (block != &pool->block_null)
+                       {
+                               int fli, sli;
+                               tlsf_insist(block_is_free(block) && "block should be free");
+                               tlsf_insist(!block_is_prev_free(block) && "blocks should have coalesced");
+                               tlsf_insist(!block_is_free(block_next(block)) && "blocks should have coalesced");
+                               tlsf_insist(block_is_prev_free(block_next(block)) && "block should be free");
+                               tlsf_insist(block_size(block) >= block_size_min && "block not minimum size");
+
+                               mapping_insert(block_size(block), &fli, &sli);
+                               tlsf_insist(fli == i && sli == j && "block size indexed in wrong list");
+                               block = block->next_free;
+                       }
+               }
+       }
+
+       return status;
+}
+
+#undef tlsf_insist
+
+static void default_walker(void* ptr, size_t size, int used, void* user)
+{
+       (void)user;
+       printf("\t%p %s size: %x (%p)\n", ptr, used ? "used" : "free", (unsigned int)size, block_from_ptr(ptr));
+}
+
+void tlsf_walk_heap(tlsf_pool pool, tlsf_walker walker, void* user)
+{
+       tlsf_walker heap_walker = walker ? walker : default_walker;
+       block_header_t* block =
+               offset_to_block(pool, sizeof(pool_t) - block_header_overhead);
+
+       while (block && !block_is_last(block))
+       {
+               heap_walker(
+                       block_to_ptr(block),
+                       block_size(block),
+                       !block_is_free(block),
+                       user);
+               block = block_next(block);
+       }
+}
+
+size_t tlsf_block_size(void* ptr)
+{
+       size_t size = 0;
+       if (ptr)
+       {
+               const block_header_t* block = block_from_ptr(ptr);
+               size = block_size(block);
+       }
+       return size;
+}
+
+/*
+** Overhead of the TLSF structures in a given memory block passed to
+** tlsf_create, equal to the size of a pool_t plus overhead of the initial
+** free block and the sentinel block.
+*/
+size_t tlsf_overhead()
+{
+       const size_t pool_overhead = sizeof(pool_t) + 2 * block_header_overhead;
+       return pool_overhead;
+}
+
+/*
+** TLSF main interface. Right out of the white paper.
+*/
+
+tlsf_pool tlsf_create(void* mem, size_t bytes)
+{
+       block_header_t* block;
+       block_header_t* next;
+
+       const size_t pool_overhead = tlsf_overhead();
+       const size_t pool_bytes = align_down(bytes - pool_overhead, ALIGN_SIZE);
+       pool_t* pool = tlsf_cast(pool_t*, mem);
+
+#if _DEBUG
+       /* Verify ffs/fls work properly. */
+       int rv = 0;
+       rv += (tlsf_ffs(0) == -1) ? 0 : 0x1;
+       rv += (tlsf_fls(0) == -1) ? 0 : 0x2;
+       rv += (tlsf_ffs(1) == 0) ? 0 : 0x4;
+       rv += (tlsf_fls(1) == 0) ? 0 : 0x8;
+       rv += (tlsf_ffs(0x80000000) == 31) ? 0 : 0x10;
+       rv += (tlsf_ffs(0x80008000) == 15) ? 0 : 0x20;
+       rv += (tlsf_fls(0x80000008) == 31) ? 0 : 0x40;
+       rv += (tlsf_fls(0x7FFFFFFF) == 30) ? 0 : 0x80;
+
+#if defined (TLSF_64BIT)
+       rv += (tlsf_fls_sizet(0x80000000) == 31) ? 0 : 0x100;
+       rv += (tlsf_fls_sizet(0x100000000) == 32) ? 0 : 0x200;
+       rv += (tlsf_fls_sizet(0xffffffffffffffff) == 63) ? 0 : 0x400; 
+       if (rv)
+       {
+               printf("tlsf_create: %x ffs/fls tests failed!\n", rv);
+               return 0;
+       }
+#endif
+#endif
+
+       if (pool_bytes < block_size_min || pool_bytes > block_size_max)
+       {
+#if defined (TLSF_64BIT)
+               printf("tlsf_create: Pool size must be at least %d bytes.\n",
+                       (unsigned int)(pool_overhead + block_size_min));
+#else
+               printf("tlsf_create: Pool size must be between %u and %u bytes.\n", 
+                       (unsigned int)(pool_overhead + block_size_min),
+                       (unsigned int)(pool_overhead + block_size_max));
+#endif
+               return 0;
+       }
+
+       /* Construct a valid pool object. */
+       pool_construct(pool);
+
+       /*
+       ** Create the main free block. Offset the start of the block slightly
+       ** so that the prev_phys_block field falls inside of the pool
+       ** structure - it will never be used.
+       */
+       block = offset_to_block(
+               tlsf_cast(void*, pool), sizeof(pool_t) - block_header_overhead);
+       block_set_size(block, pool_bytes);
+       block_set_free(block);
+       block_set_prev_used(block);
+       block_insert(pool, block);
+
+       /* Split the block to create a zero-size pool sentinel block. */
+       next = block_link_next(block);
+       block_set_size(next, 0);
+       block_set_used(next);
+       block_set_prev_free(next);
+
+       return tlsf_cast(tlsf_pool, pool);
+}
+
+void tlsf_destroy(tlsf_pool pool)
+{
+       /* Nothing to do. */
+       pool = pool;
+}
+
+void* tlsf_malloc(tlsf_pool tlsf, size_t size)
+{
+       pool_t* pool = tlsf_cast(pool_t*, tlsf);
+       const size_t adjust = adjust_request_size(size, ALIGN_SIZE);
+       block_header_t* block = block_locate_free(pool, adjust);
+       return block_prepare_used(pool, block, adjust);
+}
+
+void* tlsf_memalign(tlsf_pool tlsf, size_t align, size_t size)
+{
+       pool_t* pool = tlsf_cast(pool_t*, tlsf);
+       const size_t adjust = adjust_request_size(size, ALIGN_SIZE);
+
+       /*
+       ** We must allocate an additional minimum block size bytes so that if
+       ** our free block will leave an alignment gap which is smaller, we can
+       ** trim a leading free block and release it back to the heap. We must
+       ** do this because the previous physical block is in use, therefore
+       ** the prev_phys_block field is not valid, and we can't simply adjust
+       ** the size of that block.
+       */
+       const size_t gap_minimum = sizeof(block_header_t);
+       const size_t size_with_gap = adjust_request_size(adjust + align + gap_minimum, align);
+
+       /* If alignment is less than or equals base alignment, we're done. */
+       const size_t aligned_size = (align <= ALIGN_SIZE) ? adjust : size_with_gap;
+
+       block_header_t* block = block_locate_free(pool, aligned_size);
+
+       /* This can't be a static assert. */
+       tlsf_assert(sizeof(block_header_t) == block_size_min + block_header_overhead);
+
+       if (block)
+       {
+               void* ptr = block_to_ptr(block);
+               void* aligned = align_ptr(ptr, align);
+               size_t gap = tlsf_cast(size_t,
+                       tlsf_cast(tlsfptr_t, aligned) - tlsf_cast(tlsfptr_t, ptr));
+
+               /* If gap size is too small, offset to next aligned boundary. */
+               if (gap && gap < gap_minimum)
+               {
+                       const size_t gap_remain = gap_minimum - gap;
+                       const size_t offset = tlsf_max(gap_remain, align);
+                       const void* next_aligned = tlsf_cast(void*,
+                               tlsf_cast(tlsfptr_t, aligned) + offset);
+
+                       aligned = align_ptr(next_aligned, align);
+                       gap = tlsf_cast(size_t,
+                               tlsf_cast(tlsfptr_t, aligned) - tlsf_cast(tlsfptr_t, ptr));
+               }
+
+               if (gap)
+               {
+                       tlsf_assert(gap >= gap_minimum && "gap size too small");
+                       block = block_trim_free_leading(pool, block, gap);
+               }
+       }
+
+       return block_prepare_used(pool, block, adjust);
+}
+
+void tlsf_free(tlsf_pool tlsf, void* ptr)
+{
+       /* Don't attempt to free a NULL pointer. */
+       if (ptr)
+       {
+               pool_t* pool = tlsf_cast(pool_t*, tlsf);
+               block_header_t* block = block_from_ptr(ptr);
+               block_mark_as_free(block);
+               block = block_merge_prev(pool, block);
+               block = block_merge_next(pool, block);
+               block_insert(pool, block);
+       }
+}
+
+/*
+** The TLSF block information provides us with enough information to
+** provide a reasonably intelligent implementation of realloc, growing or
+** shrinking the currently allocated block as required.
+**
+** This routine handles the somewhat esoteric edge cases of realloc:
+** - a non-zero size with a null pointer will behave like malloc
+** - a zero size with a non-null pointer will behave like free
+** - a request that cannot be satisfied will leave the original buffer
+**   untouched
+** - an extended buffer size will leave the newly-allocated area with
+**   contents undefined
+*/
+void* tlsf_realloc(tlsf_pool tlsf, void* ptr, size_t size)
+{
+       pool_t* pool = tlsf_cast(pool_t*, tlsf);
+       void* p = 0;
+
+       /* Zero-size requests are treated as free. */
+       if (ptr && size == 0)
+       {
+               tlsf_free(tlsf, ptr);
+       }
+       /* Requests with NULL pointers are treated as malloc. */
+       else if (!ptr)
+       {
+               p = tlsf_malloc(tlsf, size);
+       }
+       else
+       {
+               block_header_t* block = block_from_ptr(ptr);
+               block_header_t* next = block_next(block);
+
+               const size_t cursize = block_size(block);
+               const size_t combined = cursize + block_size(next) + block_header_overhead;
+               const size_t adjust = adjust_request_size(size, ALIGN_SIZE);
+
+               /*
+               ** If the next block is used, or when combined with the current
+               ** block, does not offer enough space, we must reallocate and copy.
+               */
+               if (adjust > cursize && (!block_is_free(next) || adjust > combined))
+               {
+                       p = tlsf_malloc(tlsf, size);
+                       if (p)
+                       {
+                               const size_t minsize = tlsf_min(cursize, size);
+                               memcpy(p, ptr, minsize);
+                               tlsf_free(tlsf, ptr);
+                       }
+               }
+               else
+               {
+                       /* Do we need to expand to the next block? */
+                       if (adjust > cursize)
+                       {
+                               block_merge_next(pool, block);
+                               block_mark_as_used(block);
+                       }
+
+                       /* Trim the resulting block and return the original pointer. */
+                       block_trim_used(pool, block, adjust);
+                       p = ptr;
+               }
+       }
+
+       return p;
+}
+
+void * tlsf_new(tlsf_pool mempool,size_t size){
+       void *p = tlsf_malloc(mempool,size);
+       if(!p){
+               std::bad_alloc b;
+               throw b;
+       }
+       return p;
+}
+
+
+void tlsf_delete(tlsf_pool mempool,void *p)
+{
+       if(p)tlsf_free(mempool,p);
+}
diff --git a/client/tlsf.h b/client/tlsf.h
new file mode 100644 (file)
index 0000000..0345c9e
--- /dev/null
@@ -0,0 +1,112 @@
+#ifndef INCLUDED_tlsf
+#define INCLUDED_tlsf
+
+/*
+** Two Level Segregated Fit memory allocator, version 1.9.
+** Written by Matthew Conte, and placed in the Public Domain.
+**     http://tlsf.baisoku.org
+**
+** Based on the original documentation by Miguel Masmano:
+**     http://rtportal.upv.es/rtmalloc/allocators/tlsf/index.shtml
+**
+** Please see the accompanying Readme.txt for implementation
+** notes and caveats.
+**
+** This implementation was written to the specification
+** of the document, therefore no GPL restrictions apply.
+*/
+#include <stddef.h>
+#include <Windows.h>
+#include <new>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/* Create/destroy a memory pool. */
+typedef void* tlsf_pool;
+tlsf_pool tlsf_create(void* mem, size_t bytes);
+void tlsf_destroy(tlsf_pool pool);
+
+/* malloc/memalign/realloc/free replacements. */
+void* tlsf_malloc(tlsf_pool pool, size_t bytes);
+void* tlsf_memalign(tlsf_pool pool, size_t align, size_t bytes);
+void* tlsf_realloc(tlsf_pool pool, void* ptr, size_t size);
+void tlsf_free(tlsf_pool pool, void* ptr);
+
+/* Debugging. */
+typedef void (*tlsf_walker)(void* ptr, size_t size, int used, void* user);
+void tlsf_walk_heap(tlsf_pool pool, tlsf_walker walker, void* user);
+/* Returns nonzero if heap check fails. */
+int tlsf_check_heap(tlsf_pool pool);
+
+/* Returns internal block size, not original request size */
+size_t tlsf_block_size(void* ptr);
+
+/* Overhead of per-pool internal structures. */
+size_t tlsf_overhead();
+
+#if defined(__cplusplus)
+};
+
+void *tlsf_new(tlsf_pool mempool,size_t size);
+void tlsf_delete(tlsf_pool mempool,void *p);
+
+template<typename T>
+T *tlsf_new(tlsf_pool mempool,size_t size){
+       T *v= (T*)tlsf_malloc(mempool,size * sizeof(T));
+       if(!v){
+               std::bad_alloc b;
+               throw b;
+       }
+       for(size_t t = 0;t < size;++t)::new(&v[t]) T;
+       return v;
+}
+
+template<typename T>
+T *tlsf_new(tlsf_pool mempool){
+       T *v= (T*)tlsf_malloc(mempool,sizeof(T));
+       if(!v){
+               std::bad_alloc b;
+               throw b;
+       }
+       return ::new(v) T;
+}
+
+template<typename T,class X>
+T *tlsf_new(tlsf_pool mempool,X initialize){
+       T *v= (T*)tlsf_malloc(mempool,sizeof(T));
+       if(!v){
+               std::bad_alloc b;
+               throw b;
+       }
+       return ::new(v) T(initialize);
+}
+
+template<typename T,class X,class Y>
+T *tlsf_new(tlsf_pool mempool,X initialize1,Y initialize2){
+       T *v= (T*)tlsf_malloc(mempool,sizeof(T));
+       if(!v){
+               std::bad_alloc b;
+               throw b;
+       }
+       return ::new(v) T(initialize1,initialize2);
+}
+
+template<typename T>
+void tlsf_delete(tlsf_pool mempool,T *p)
+{
+       p->~T();
+       if(p)tlsf_free(mempool,p);
+}
+
+template<typename T>
+void tlsf_delete(tlsf_pool mempool,T *p,size_t size)
+{
+       int i = 0;
+       for(i;i < size;++i)p->~T();
+       if(p)tlsf_free(mempool,p);
+}
+#endif
+
+#endif
diff --git a/client/tlsfbits.h b/client/tlsfbits.h
new file mode 100644 (file)
index 0000000..3e5c82a
--- /dev/null
@@ -0,0 +1,180 @@
+#ifndef INCLUDED_tlsfbits
+#define INCLUDED_tlsfbits
+
+#if defined(__cplusplus)
+#define tlsf_decl inline
+#else
+#define tlsf_decl static
+#endif
+
+/*
+** Architecture-specific bit manipulation routines.
+**
+** TLSF achieves O(1) cost for malloc and free operations by limiting
+** the search for a free block to a free list of guaranteed size
+** adequate to fulfill the request, combined with efficient free list
+** queries using bitmasks and architecture-specific bit-manipulation
+** routines.
+**
+** Most modern processors provide instructions to count leading zeroes
+** in a word, find the lowest and highest set bit, etc. These
+** specific implementations will be used when available, falling back
+** to a reasonably efficient generic implementation.
+**
+** NOTE: TLSF spec relies on ffs/fls returning value 0..31.
+** ffs/fls return 1-32 by default, returning 0 for error.
+*/
+
+/*
+** Detect whether or not we are building for a 32- or 64-bit (LP/LLP)
+** architecture. There is no reliable portable method at compile-time.
+*/
+#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \
+       || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__)
+#define TLSF_64BIT
+#endif
+
+/*
+** gcc 3.4 and above have builtin support, specialized for architecture.
+** Some compilers masquerade as gcc; patchlevel test filters them out.
+*/
+#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \
+       && defined (__GNUC_PATCHLEVEL__)
+
+tlsf_decl int tlsf_ffs(unsigned int word)
+{
+       return __builtin_ffs(word) - 1;
+}
+
+tlsf_decl int tlsf_fls(unsigned int word)
+{
+       const int bit = word ? 32 - __builtin_clz(word) : 0;
+       return bit - 1;
+}
+
+#elif defined (_MSC_VER) && defined (_M_IX86) && (_MSC_VER >= 1400)
+/* Microsoft Visual C++ 2005 support on x86 architectures. */
+
+#include <intrin.h>
+
+#pragma intrinsic(_BitScanReverse)
+#pragma intrinsic(_BitScanForward)
+
+tlsf_decl int tlsf_fls(unsigned int word)
+{
+       unsigned long index;
+       return _BitScanReverse(&index, word) ? index : -1;
+}
+
+tlsf_decl int tlsf_ffs(unsigned int word)
+{
+       unsigned long index;
+       return _BitScanForward(&index, word) ? index : -1;
+}
+
+#elif defined (_MSC_VER) && defined (_M_PPC)
+/* Microsoft Visual C++ support on PowerPC architectures. */
+
+#include <ppcintrinsics.h>
+
+tlsf_decl int tlsf_fls(unsigned int word)
+{
+       const int bit = 32 - _CountLeadingZeros(word);
+       return bit - 1;
+}
+
+tlsf_decl int tlsf_ffs(unsigned int word)
+{
+       const unsigned int reverse = word & (~word + 1);
+       const int bit = 32 - _CountLeadingZeros(reverse);
+       return bit - 1;
+}
+
+#elif defined (__ARMCC_VERSION)
+/* RealView Compilation Tools for ARM */
+
+tlsf_decl int tlsf_ffs(unsigned int word)
+{
+       const unsigned int reverse = word & (~word + 1);
+       const int bit = 32 - __clz(reverse);
+       return bit - 1;
+}
+
+tlsf_decl int tlsf_fls(unsigned int word)
+{
+       const int bit = word ? 32 - __clz(word) : 0;
+       return bit - 1;
+}
+
+#elif defined (__ghs__)
+/* Green Hills support for PowerPC */
+
+#include <ppc_ghs.h>
+
+tlsf_decl int tlsf_ffs(unsigned int word)
+{
+       const unsigned int reverse = word & (~word + 1);
+       const int bit = 32 - __CLZ32(reverse);
+       return bit - 1;
+}
+
+tlsf_decl int tlsf_fls(unsigned int word)
+{
+       const int bit = word ? 32 - __CLZ32(word) : 0;
+       return bit - 1;
+}
+
+#else
+/* Fall back to generic implementation. */
+
+tlsf_decl int tlsf_fls_generic(unsigned int word)
+{
+       int bit = 32;
+
+       if (!word) bit -= 1;
+       if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; }
+       if (!(word & 0xff000000)) { word <<= 8; bit -= 8; }
+       if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; }
+       if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; }
+       if (!(word & 0x80000000)) { word <<= 1; bit -= 1; }
+
+       return bit;
+}
+
+/* Implement ffs in terms of fls. */
+tlsf_decl int tlsf_ffs(unsigned int word)
+{
+       return tlsf_fls_generic(word & (~word + 1)) - 1;
+}
+
+tlsf_decl int tlsf_fls(unsigned int word)
+{
+       return tlsf_fls_generic(word) - 1;
+}
+
+#endif
+
+/* Possibly 64-bit version of tlsf_fls. */
+#if defined (TLSF_64BIT)
+tlsf_decl int tlsf_fls_sizet(size_t size)
+{
+       int high = (int)(size >> 32);
+       int bits = 0;
+       if (high)
+       {
+               bits = 32 + tlsf_fls(high);
+       }
+       else
+       {
+               bits = tlsf_fls((int)size & 0xffffffff);
+
+       }
+       return bits;
+}
+#else
+#define tlsf_fls_sizet tlsf_fls
+#endif
+
+#undef tlsf_decl
+
+#endif
index f90f9aa..4a477e4 100644 (file)
@@ -117,6 +117,18 @@ class UISuper : public std::enable_shared_from_this<UISuper> {
         std::string base_image_;
 
                ImageHandlePtr icon_image_handle_;
+
+       public:
+               void *operator new(size_t size)
+               {
+                       return tlsf_new(ResourceManager::memory_pool(), size);
+               }
+               void *operator new(size_t, void *p){return p;}
+               void operator delete(void *p)
+               {
+                       tlsf_delete(ResourceManager::memory_pool(), p);
+               }
+               void operator delete(void *, void *){};
 };
 
 typedef std::shared_ptr<UISuper> UISuperPtr;
index 57db3b0..50665c1 100644 (file)
@@ -67,12 +67,6 @@ def make_full_package(model = True):
                relative_path = os.path.relpath(absolute_path, bin_path)
                zip.write(absolute_path, relative_path)
                
-       for root, dirs, files in os.walk(os.path.join(bin_path, 'server/channels')):
-           for file in files:
-               absolute_path = os.path.join(root, file)
-               relative_path = os.path.relpath(absolute_path, bin_path)
-               zip.write(absolute_path, relative_path)
-               
        zip.writestr('music/', '')
        zip.writestr('se/', '')
                
@@ -102,12 +96,6 @@ def make_server_package():
        bin_path = os.path.join(base_dir, 'client/bin/')
        zip.write(os.path.join(bin_path, 'server/server.exe'), 'server.exe')
        zip.write(os.path.join(bin_path, 'server/config.json'), 'config.json')
-       
-       for root, dirs, files in os.walk(os.path.join(bin_path, 'server/channels')):
-           for file in files:
-               absolute_path = os.path.join(root, file)
-               relative_path = os.path.relpath(absolute_path, bin_path)
-               zip.write(absolute_path, relative_path)
                
        zip.close()
        
index ca034b6..16dcd29 100644 (file)
@@ -202,8 +202,8 @@ namespace network {
         }\r
 \r
         auto new_session = boost::make_shared<ServerSession>(io_service_);\r
-         acceptor_.async_accept(new_session->tcp_socket(),\r
-                 boost::bind(&Server::ReceiveSession, this, new_session, boost::asio::placeholders::error));\r
+        acceptor_.async_accept(new_session->tcp_socket(),\r
+                boost::bind(&Server::ReceiveSession, this, new_session, boost::asio::placeholders::error));\r
 \r
                RefreshSession();\r
     }\r