Browse Source

removed coroutines

dmuratshin 9 years ago
parent
commit
007a379a26

+ 0 - 2
oxygine/SDL/win32/oxygine.vcxproj

@@ -120,7 +120,6 @@
     <ClCompile Include="..\..\src\ClipRectActor.cpp" />
     <ClCompile Include="..\..\src\ClipRectActor.cpp" />
     <ClCompile Include="..\..\src\Clock.cpp" />
     <ClCompile Include="..\..\src\Clock.cpp" />
     <ClCompile Include="..\..\src\ColorRectSprite.cpp" />
     <ClCompile Include="..\..\src\ColorRectSprite.cpp" />
-    <ClCompile Include="..\..\src\core\coroutines.cpp" />
     <ClCompile Include="..\..\src\core\curl\HttpRequestCurlTask.cpp" />
     <ClCompile Include="..\..\src\core\curl\HttpRequestCurlTask.cpp" />
     <ClCompile Include="..\..\src\core\file.cpp" />
     <ClCompile Include="..\..\src\core\file.cpp" />
     <ClCompile Include="..\..\src\core\FileSystem.cpp" />
     <ClCompile Include="..\..\src\core\FileSystem.cpp" />
@@ -223,7 +222,6 @@
     <ClInclude Include="..\..\src\ClipRectActor.h" />
     <ClInclude Include="..\..\src\ClipRectActor.h" />
     <ClInclude Include="..\..\src\Clock.h" />
     <ClInclude Include="..\..\src\Clock.h" />
     <ClInclude Include="..\..\src\ColorRectSprite.h" />
     <ClInclude Include="..\..\src\ColorRectSprite.h" />
-    <ClInclude Include="..\..\src\core\coroutines.h" />
     <ClInclude Include="..\..\src\core\curl\HttpRequestCurlTask.h" />
     <ClInclude Include="..\..\src\core\curl\HttpRequestCurlTask.h" />
     <ClInclude Include="..\..\src\core\file.h" />
     <ClInclude Include="..\..\src\core\file.h" />
     <ClInclude Include="..\..\src\core\FileSystem.h" />
     <ClInclude Include="..\..\src\core\FileSystem.h" />

+ 0 - 6
oxygine/SDL/win32/oxygine.vcxproj.filters

@@ -135,9 +135,6 @@
     <ClCompile Include="..\..\src\core\gl\VideoDriverGL.cpp">
     <ClCompile Include="..\..\src\core\gl\VideoDriverGL.cpp">
       <Filter>src\gl</Filter>
       <Filter>src\gl</Filter>
     </ClCompile>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\coroutines.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\core\file.cpp">
     <ClCompile Include="..\..\src\core\file.cpp">
       <Filter>src\core</Filter>
       <Filter>src\core</Filter>
     </ClCompile>
     </ClCompile>
@@ -479,9 +476,6 @@
     <ClInclude Include="..\..\src\core\gl\VideoDriverGL.h">
     <ClInclude Include="..\..\src\core\gl\VideoDriverGL.h">
       <Filter>src\gl</Filter>
       <Filter>src\gl</Filter>
     </ClInclude>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\coroutines.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\file.h">
     <ClInclude Include="..\..\src\core\file.h">
       <Filter>src\core</Filter>
       <Filter>src\core</Filter>
     </ClInclude>
     </ClInclude>

+ 0 - 110
oxygine/src/core/coroutines.cpp

@@ -1,110 +0,0 @@
-#include "coroutines.h"
-
-#if __S3E__
-#define OXYGINE_COROUTINES
-#include "IwFibre.h"
-#elif OXYGINE_EDITOR
-#elif OXYGINE_SDL
-#ifndef __APPLE__
-//#include "greenlet.h"
-#else
-#endif
-#else
-#endif
-
-#define GREENLETS 0
-
-namespace oxygine
-{
-    namespace coroutine
-    {
-        int fiberPassData = 0;
-
-        void init()
-        {
-#if __S3E__
-#elif GREENLETS
-            greenlets_init();
-#else
-#endif
-        }
-
-        handle current()
-        {
-#if __S3E__
-            handle f = (handle)IwFibreGetCurrent();
-            return f;
-#elif GREENLETS
-            handle f = (handle)greenlet_getcurrent();
-            return f;
-#else
-            OX_ASSERT(!"not implemented");
-            return 0;
-#endif
-        }
-
-        handle create(fiberFunc func, int stackSize, void* param)
-        {
-#if __S3E__
-            handle f = (handle)IwFibreCreate(func, stackSize, param, 0);
-            return f;
-#elif GREENLETS
-            handle f = (handle)greenlet_create((gr_callback)func);
-            return f;
-#else
-
-#endif
-            return 0;
-        }
-
-        void terminate(handle fiber, int data)
-        {
-#if __S3E__
-            if (data)
-                resume(fiber, data);
-            IwFibreJoin((IwFibre*)fiber);
-            IwFibreDelete((IwFibre*)fiber);
-#elif GREENLETS
-            greenlet_kill((greenlet*)fiber);
-#else
-            //assert(0);
-#endif
-        }
-
-        int resume(handle fiber, int data)
-        {
-            fiberPassData = data;
-            int r = 0;
-#if __S3E__
-            IwFibreYield((IwFibre*)fiber);
-#elif GREENLETS
-            if (!fiber)
-                fiber = greenlet_getparent();
-            r = greenlet_switch((greenlet*)fiber, data);
-#else
-
-#endif
-
-            if (fiber == 0)
-            {
-                if (fiberPassData == 1)
-                {
-                    throw FiberExit();
-                }
-            }
-
-            return r;
-        }
-
-        bool isdead(handle fiber)
-        {
-#if __S3E__
-            return !IwFibreIsRunning((IwFibre*) fiber);
-#elif GREENLETS
-            return greenlet_isdead((greenlet*) fiber) != 0;
-#else
-            return false;
-#endif
-        }
-    }
-}

+ 0 - 26
oxygine/src/core/coroutines.h

@@ -1,26 +0,0 @@
-#pragma once
-#include "oxygine-include.h"
-
-namespace oxygine
-{
-    namespace coroutine
-    {
-        class FiberExit
-        {
-        public:
-
-        };
-
-        typedef void* handle;
-
-        typedef void* (*fiberFunc)(void* param);
-
-        void init();
-        handle create(fiberFunc func, int stackSize, void* param);
-        handle current();
-
-        void terminate(handle fiber, int data = 0);
-        int resume(handle fiber = 0, int data = 0);
-        bool isdead(handle fiber);
-    }
-}

+ 0 - 2
oxygine/src/core/oxygine.cpp

@@ -55,8 +55,6 @@
 #endif
 #endif
 
 
 #ifdef OXYGINE_SDL
 #ifdef OXYGINE_SDL
-#include "coroutines.h"
-
 extern "C"
 extern "C"
 {
 {
 #include "SDL.h"
 #include "SDL.h"

+ 0 - 1
oxygine/src/oxygine-framework.h

@@ -49,7 +49,6 @@
 //#include "closure/closure_impl.h"
 //#include "closure/closure_impl.h"
 
 
 //core/
 //core/
-#include "core/coroutines.h"
 #include "core/file.h"
 #include "core/file.h"
 #include "core/ImageData.h"
 #include "core/ImageData.h"
 #include "core/ImageDataOperations.h"
 #include "core/ImageDataOperations.h"