packet framework + reorganize some files

Author: kiwi515

include/revolution/SO/SOCommon.h

@@ -72,8 +72,8 @@ typedef enum {
 
 typedef enum {
     SO_SO_REUSEADDR = 0x0004,
-    SO_SO_SNDBUF = 0x1002,
-    SO_SO_RCVBUF = 0x1003,
+    SO_SO_SNDBUF = 0x1001,
+    SO_SO_RCVBUF = 0x1002,
 } SOSockOpt;
 
 typedef enum { SO_SHUT_RD, SO_SHUT_WR, SO_SHUT_RDWR } SOShutdownType;

lib/libkiwi/core/kiwiThread.cpp lib/libkiwi/core/kiwiStdThread.cpplib/libkiwi/core/kiwiThread.cpp renamed to lib/libkiwi/core/kiwiStdThread.cpp

@@ -1,5 +1,3 @@
-#include <libkiwi/prim/kiwiBitCast.h>
-
 #include <libkiwi.h>
 
 namespace kiwi {
@@ -8,37 +6,38 @@ namespace detail {
 /**
  * @brief Constructor
  */
-ThreadImpl::ThreadImpl() : mpOSThread(nullptr), mpThreadStack(nullptr) {
+StdThreadImpl::StdThreadImpl() : mpOSThread(nullptr), mpThreadStack(nullptr) {
     // Thread & stack aligned to 32
     mpOSThread = new (32) OSThread();
     K_ASSERT_PTR(mpOSThread);
     mpThreadStack = new (32) u8[scStackSize];
     K_ASSERT_PTR(mpThreadStack);
 
-    BOOL success =
-        OSCreateThread(mpOSThread, nullptr, nullptr,
-                       mpThreadStack + scStackSize, scStackSize, scPriority, 0);
+    BOOL success = OSCreateThread(mpOSThread, nullptr, nullptr,
+                                  mpThreadStack + scStackSize, scStackSize,
+                                  OS_PRIORITY_MAX - 1, 0);
+
     K_ASSERT(success);
 }
 
 /**
  * @brief Destructor
  */
-ThreadImpl::~ThreadImpl() {
+StdThreadImpl::~StdThreadImpl() {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT_EX(*mpOSThread->stackEnd == OS_THREAD_STACK_MAGIC,
                 "Thread stack overflow!!!");
 
     OSDetachThread(mpOSThread);
 
     delete mpOSThread;
-    delete mpThreadStack;
+    delete[] mpThreadStack;
 }
 
 /**
  * @brief Begins execution on this thread
  */
-void ThreadImpl::Start() {
+void StdThreadImpl::Start() {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT(mpOSThread->state == OS_THREAD_STATE_READY);
     K_ASSERT_EX(mpOSThread->context.srr0 != 0, "No function to call");
@@ -51,7 +50,7 @@ void ThreadImpl::Start() {
 /**
  * @brief Waits for this thread to finish executing
  */
-void ThreadImpl::Join() {
+void StdThreadImpl::Join() {
     K_ASSERT_PTR(mpOSThread);
 
     BOOL success = OSJoinThread(mpOSThread, nullptr);
@@ -63,7 +62,7 @@ void ThreadImpl::Join() {
  *
  * @param addr Function address (new SRR0 value)
  */
-void ThreadImpl::SetFunction(const void* addr) {
+void StdThreadImpl::SetFunction(const void* addr) {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT(addr != 0);
     mpOSThread->context.srr0 = BitCast<u32>(addr);
@@ -75,7 +74,7 @@ void ThreadImpl::SetFunction(const void* addr) {
  * @param i GPR number
  * @param value New value
  */
-void ThreadImpl::SetGPR(u32 idx, u32 value) {
+void StdThreadImpl::SetGPR(u32 idx, u32 value) {
     K_ASSERT_PTR(mpOSThread);
     K_ASSERT(idx >= 0 && idx < K_LENGTHOF(mpOSThread->context.gprs));
     mpOSThread->context.gprs[idx] = value;

lib/libkiwi/core/kiwiThread.h lib/libkiwi/core/kiwiStdThread.hlib/libkiwi/core/kiwiThread.h renamed to lib/libkiwi/core/kiwiStdThread.h

@@ -1,5 +1,5 @@
-#ifndef LIBKIWI_CORE_THREAD_H
-#define LIBKIWI_CORE_THREAD_H
+#ifndef LIBKIWI_CORE_STD_THREAD_H
+#define LIBKIWI_CORE_STD_THREAD_H
 #include <libkiwi/debug/kiwiAssert.h>
 #include <libkiwi/k_types.h>
 
@@ -16,7 +16,7 @@ namespace detail {
 /**
  * @brief Common thread implementation
  */
-class ThreadImpl {
+class StdThreadImpl {
 public:
     /**
      * @brief Waits for this thread to finish executing
@@ -27,11 +27,11 @@ class ThreadImpl {
     /**
      * @brief Constructor
      */
-    ThreadImpl();
+    StdThreadImpl();
     /**
      * @brief Destructor
      */
-    ~ThreadImpl();
+    ~StdThreadImpl();
 
     /**
      * @brief Begins execution on this thread
@@ -77,7 +77,7 @@ class ThreadImpl {
  * @details Similar to std::thread.
  * @note Only allows GPR arguments
  */
-class Thread : public detail::ThreadImpl {
+class StdThread : public detail::StdThreadImpl {
 public:
     // Thread function parameter
     typedef void* Param;
@@ -92,14 +92,14 @@ class Thread : public detail::ThreadImpl {
      *
      * @param pFunc Static, no-parameter function
      */
-    template <typename TRet> Thread(TRet (*pFunc)());
+    template <typename TRet> StdThread(TRet (*pFunc)());
     /**
      * @brief Constructor
      *
      * @param pFunc Static, single-parameter function
      * @param pArg Function argument
      */
-    template <typename TRet> Thread(TRet (*pFunc)(Param), Param pArg);
+    template <typename TRet> StdThread(TRet (*pFunc)(Param), Param pArg);
     /**@}*/
 
     /**
@@ -113,7 +113,7 @@ class Thread : public detail::ThreadImpl {
      * @param rObj Class instance
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)(), TClass& rObj);
+    StdThread(TRet (TClass::*pFunc)(), TClass& rObj);
     /**
      * @brief Constructor
      *
@@ -122,7 +122,7 @@ class Thread : public detail::ThreadImpl {
      * @param pArg Function argument
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)(Param), TClass& rObj, Param pArg);
+    StdThread(TRet (TClass::*pFunc)(Param), TClass& rObj, Param pArg);
     /**@}*/
 
     /**
@@ -136,7 +136,7 @@ class Thread : public detail::ThreadImpl {
      * @param rObj Class instance
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)() const, const TClass& rObj);
+    StdThread(TRet (TClass::*pFunc)() const, const TClass& rObj);
     /**
      * @brief Constructor
      *
@@ -145,7 +145,8 @@ class Thread : public detail::ThreadImpl {
      * @param pArg Function argument
      */
     template <typename TRet, typename TClass>
-    Thread(TRet (TClass::*pFunc)(Param) const, const TClass& rObj, Param pArg);
+    StdThread(TRet (TClass::*pFunc)(Param) const, const TClass& rObj,
+              Param pArg);
     /**@}*/
 };
 
@@ -154,7 +155,7 @@ class Thread : public detail::ThreadImpl {
 
 // Implementation header
 #ifndef LIBKIWI_CORE_THREAD_IMPL_HPP
-#include <libkiwi/core/kiwiThreadImpl.hpp>
+#include <libkiwi/core/kiwiStdThreadImpl.hpp>
 #endif
 
 #endif

lib/libkiwi/core/kiwiThreadImpl.hpp lib/libkiwi/core/kiwiStdThreadImpl.hpplib/libkiwi/core/kiwiThreadImpl.hpp renamed to lib/libkiwi/core/kiwiStdThreadImpl.hpp

@@ -1,10 +1,10 @@
 // Implementation header
-#ifndef LIBKIWI_CORE_THREAD_IMPL_HPP
-#define LIBKIWI_CORE_THREAD_IMPL_HPP
+#ifndef LIBKIWI_CORE_STD_THREAD_IMPL_HPP
+#define LIBKIWI_CORE_STD_THREAD_IMPL_HPP
 
 // Declaration header
-#ifndef LIBKIWI_CORE_THREAD_H
-#include <libkiwi/core/kiwiThread.h>
+#ifndef LIBKIWI_CORE_STD_THREAD_H
+#include <libkiwi/core/kiwiStdThread.h>
 #endif
 
 #include <libkiwi/prim/kiwiBitCast.h>
@@ -22,7 +22,7 @@ namespace kiwi {
  *
  * @param pFunc Static, no-parameter function
  */
-template <typename TRet> Thread::Thread(TRet (*pFunc)()) {
+template <typename TRet> StdThread::StdThread(TRet (*pFunc)()) {
     K_ASSERT_PTR(pFunc);
 
     SetFunction(pFunc);
@@ -36,7 +36,7 @@ template <typename TRet> Thread::Thread(TRet (*pFunc)()) {
  * @param pArg Function argument
  */
 template <typename TRet>
-Thread::Thread(TRet (*pFunc)(Thread::Param), Thread::Param pArg) {
+StdThread::StdThread(TRet (*pFunc)(StdThread::Param), StdThread::Param pArg) {
     K_ASSERT_PTR(pFunc);
 
     SetFunction(pFunc);
@@ -56,7 +56,7 @@ Thread::Thread(TRet (*pFunc)(Thread::Param), Thread::Param pArg) {
  * @param rObj Class instance
  */
 template <typename TRet, typename TClass>
-Thread::Thread(TRet (TClass::*pFunc)(), TClass& rObj) {
+StdThread::StdThread(TRet (TClass::*pFunc)(), TClass& rObj) {
     K_ASSERT(pFunc);
 
     SetMemberFunction(pFunc, rObj);
@@ -71,8 +71,8 @@ Thread::Thread(TRet (TClass::*pFunc)(), TClass& rObj) {
  * @param pArg Function argument
  */
 template <typename TRet, typename TClass>
-Thread::Thread(TRet (TClass::*pFunc)(Thread::Param), TClass& rObj,
-               Thread::Param pArg) {
+StdThread::StdThread(TRet (TClass::*pFunc)(StdThread::Param), TClass& rObj,
+                     StdThread::Param pArg) {
     K_ASSERT(pFunc);
 
     SetMemberFunction(pFunc, rObj);
@@ -92,7 +92,7 @@ Thread::Thread(TRet (TClass::*pFunc)(Thread::Param), TClass& rObj,
  * @param rObj Class instance
  */
 template <typename TRet, typename TClass>
-Thread::Thread(TRet (TClass::*pFunc)() const, const TClass& rObj) {
+StdThread::StdThread(TRet (TClass::*pFunc)() const, const TClass& rObj) {
     K_ASSERT(pFunc);
 
     SetMemberFunction(pFunc, rObj);
@@ -107,8 +107,8 @@ Thread::Thread(TRet (TClass::*pFunc)() const, const TClass& rObj) {
  * @param pArg Function argument
  */
 template <typename TRet, typename TClass>
-Thread::Thread(TRet (TClass::*pFunc)(Thread::Param) const, const TClass& rObj,
-               Thread::Param pArg) {
+StdThread::StdThread(TRet (TClass::*pFunc)(StdThread::Param) const,
+                     const TClass& rObj, StdThread::Param pArg) {
     K_ASSERT(pFunc);
 
     SetMemberFunction(pFunc, rObj);
@@ -139,8 +139,8 @@ struct MemberFunction {
  * @param rObj Class instance
  */
 template <typename TFunc, typename TClass>
-K_DONT_INLINE void ThreadImpl::SetMemberFunction(TFunc pFunc,
-                                                 const TClass& rObj) {
+K_DONT_INLINE void StdThreadImpl::SetMemberFunction(TFunc pFunc,
+                                                    const TClass& rObj) {
 
     K_STATIC_ASSERT_EX(sizeof(TFunc) == sizeof(MemberFunction),
                        "Not a member function");

lib/libkiwi/hostio/kiwiHostIOServer.cpp

@@ -16,7 +16,7 @@ Server::Server()
       mpServerSocket(nullptr),
       mpClientSocket(nullptr) {
 
-    mpMainThread = new Thread(ThreadFunc, *this);
+    mpMainThread = new StdThread(ThreadFunc, *this);
     K_ASSERT_PTR(mpMainThread);
 }
 

lib/libkiwi/hostio/kiwiHostIOServer.h

@@ -1,6 +1,5 @@
 #ifndef LIBKIWI_HOSTIO_HOST_IO_SERVER_H
 #define LIBKIWI_HOSTIO_HOST_IO_SERVER_H
-#include <libkiwi/core/kiwiThread.h>
 #include <libkiwi/hostio/kiwiHostIOContext.h>
 #include <libkiwi/k_types.h>
 #include <libkiwi/net/kiwiSyncSocket.h>
@@ -12,6 +11,10 @@
 namespace kiwi {
 //! @addtogroup libkiwi_hostio
 //! @{
+
+// Forward declarations
+class StdThread;
+
 namespace hostio {
 //! @addtogroup libkiwi_hostio
 //! @{
@@ -89,7 +92,7 @@ class Server : public DynamicSingleton<Server> {
     Reflexible* mpRootNode;
 
     //! Main loop thread
-    Thread* mpMainThread;
+    StdThread* mpMainThread;
 
     //! Server socket
     SyncSocket* mpServerSocket;

lib/libkiwi/libkiwi.h

@@ -18,7 +18,7 @@
 #include <libkiwi/core/kiwiSceneCreator.h>
 #include <libkiwi/core/kiwiSceneHookMgr.h>
 #include <libkiwi/core/kiwiStaticMem.h>
-#include <libkiwi/core/kiwiThread.h>
+#include <libkiwi/core/kiwiStdThread.h>
 #include <libkiwi/crypt/kiwiBase64.h>
 #include <libkiwi/crypt/kiwiChecksum.h>
 #include <libkiwi/crypt/kiwiSHA1.h>
@@ -53,19 +53,21 @@
 #include <libkiwi/net/kiwiAsyncSocket.h>
 #include <libkiwi/net/kiwiAsyncSocketMgr.h>
 #include <libkiwi/net/kiwiHttpRequest.h>
-#include <libkiwi/net/kiwiIPacketFactory.h>
 #include <libkiwi/net/kiwiNetBuffer.h>
 #include <libkiwi/net/kiwiNetClient.h>
 #include <libkiwi/net/kiwiNetConnection.h>
 #include <libkiwi/net/kiwiNetConnectionMgr.h>
 #include <libkiwi/net/kiwiNetServer.h>
-#include <libkiwi/net/kiwiPacketBase.h>
-#include <libkiwi/net/kiwiPacketFactory.h>
 #include <libkiwi/net/kiwiPortRegistry.h>
-#include <libkiwi/net/kiwiRawPacket.h>
-#include <libkiwi/net/kiwiSizedPacket.h>
 #include <libkiwi/net/kiwiSocketBase.h>
 #include <libkiwi/net/kiwiSyncSocket.h>
+#include <libkiwi/net/packet/kiwiFixedPacket.h>
+#include <libkiwi/net/packet/kiwiFixedPacketFactory.h>
+#include <libkiwi/net/packet/kiwiIPacketFactory.h>
+#include <libkiwi/net/packet/kiwiPacketBase.h>
+#include <libkiwi/net/packet/kiwiPacketFactory.h>
+#include <libkiwi/net/packet/kiwiVariablePacket.h>
+#include <libkiwi/net/packet/kiwiVariablePacketFactory.h>
 #include <libkiwi/prim/kiwiAlgorithm.h>
 #include <libkiwi/prim/kiwiArray.h>
 #include <libkiwi/prim/kiwiBitCast.h>

lib/libkiwi/net/kiwiAsyncSocket.cpp

@@ -229,7 +229,7 @@ class AsyncSocket::RecvJob : public IJob {
                                   pAsyncSocket->mType);
         K_ASSERT_PTR(mpSocket);
 
-        mpPacket = new RawPacket();
+        mpPacket = new FixedPacket();
         mpPacket->Alloc(len);
         mpPacket->Recv(mpSocket);
     }
@@ -275,7 +275,7 @@ class AsyncSocket::RecvJob : public IJob {
     //! Temporary socket for synchronous communication
     SyncSocket* mpSocket;
     //! Raw data packet
-    RawPacket* mpPacket;
+    FixedPacket* mpPacket;
 
     //! Destination buffer
     void* mpDst;
@@ -327,7 +327,7 @@ class AsyncSocket::SendJob : public IJob {
                                   pAsyncSocket->mType);
         K_ASSERT_PTR(mpSocket);
 
-        mpPacket = new RawPacket(pPeerAddr);
+        mpPacket = new FixedPacket(pPeerAddr);
         mpPacket->Alloc(len);
         mpPacket->SetContent(pSrc, len);
         mpPacket->Send(mpSocket);
@@ -367,7 +367,7 @@ class AsyncSocket::SendJob : public IJob {
     //! Temporary socket for synchronous communication
     SyncSocket* mpSocket;
     //! Raw data packet
-    RawPacket* mpPacket;
+    FixedPacket* mpPacket;
 
     //! Transfer callback
     XferCallback mpCallback;

lib/libkiwi/net/kiwiAsyncSocketMgr.cpp

@@ -7,7 +7,7 @@ namespace detail {
  * @brief Constructor
  */
 AsyncSocketMgr::AsyncSocketMgr() {
-    mpThread = new Thread(&AsyncSocketMgr::ThreadFunc, *this);
+    mpThread = new StdThread(&AsyncSocketMgr::ThreadFunc, *this);
 }
 
 /**