Changeset 27 in Main

Timestamp:

28/11/2011 06:13:31 (18 months ago)

Author:

duggan

Message:

Added test client. When server is running, client makes dummy request for context. Server returns dummy contextid.

Location:

src

Files:

• gfx_server/App.cpp (modified) (2 diffs)
• gfx_server/App.h (modified) (2 diffs)
• test_client (added)
• test_client/(Objects.test_client) (added)
• test_client/Drafter.h (added)
• test_client/Makefile (added)
• test_client/main.cpp (added)
• test_client/objects.x86-gcc2-release (added)
• test_client/objects.x86-gcc2-release/main.d (added)
• test_client/objects.x86-gcc2-release/test_client (added)
• test_client/test_client.pld (added)
• test_lib/Drafter.h (modified) (3 diffs)
• test_lib/DrafterPrivateDefs.h (modified) (2 diffs)
• test_lib/context.cpp (modified) (5 diffs)
• test_lib/lib3DStack.pld (modified) (1 diff)

src/gfx_server/App.cpp

@@ -28 +28 @@
         HeadList = new Head*[HeadCount];
         headindex = 0;
+        ContextNum = 0;
 }
 
@@ -176 +177 @@
                 {
                         QuitRequested();
+                        break;
                 }
-                case GFX_CREATE_CONTEXT:
+                case D_CREATE_CONTEXT:
                 {
                         cout<<"Context creation request received"<<endl;
+                        // respond...
+                        BMessage* m = new BMessage(D_REPLY);
+                        m->AddInt32("contextid", (int32)ContextNum);
+                        message->SendReply(m);
+                        ContextNum++;
+                        break;
                 }
         }

src/gfx_server/App.h

@@ -24 +24 @@
 #define MAX_SLOTS 8
 
+#define D_CREATE_CONTEXT        'dcct'
+#define D_REPLY                         'drep'
+
 class App : public BApplication {
 public:
@@ -41 +44 @@
         Head**          HeadList;
         thread_id       ConsoleID;
+        uint32          ContextNum;
 };
 

src/test_lib/Drafter.h

@@ -7 +7 @@
 
 #include <SupportDefs.h>
-
+#include <Messenger.h>
 
 // CONSTANTS /////////////////////////////
@@ -16 +16 @@
 #define D_ERR_NO_CONTEXT_AVAILABLE 0xFFFFFFFF
 #define D_ERR_BAD_CONTEXT_ID 1
+
+#define D_CREATE_CONTEXT        'dcct'
+#define D_REPLY                         'drep'
 
 // FUNCTIONS /////////////////////////////
@@ -28 +31 @@
 
 // LOCAL VARIABLES ///////////////////////
-uint32 current_context;
-
+uint32 current_context = 0xdeadbeef;
+BMessenger* server_msgr = NULL;
 
 #endif // DRAFTER_H

src/test_lib/DrafterPrivateDefs.h

@@ -16 +16 @@
 #ifdef __HAIKU__
 
-static area_id context_area = B_ERROR; // invalid default
-static char* context_addr = NULL;
+//static area_id context_area = B_ERROR; // invalid default
+//static char* context_addr = NULL;
 
 #define CONTEXT_AREA_NAME "Drafter Context Area"
@@ -44 +44 @@
 };
 
-static ContextData* contexts;
-static uint32* contextCount;
+//static ContextData* contexts;
+//static uint32* contextCount;
 
 

src/test_lib/context.cpp

@@ -9 +9 @@
 #include <iostream>
 
+using namespace std;
+
 // TODO: add parameters like width, height, team id, workspace, etc
 uint32
 CreateContext()
 {
-#ifdef __HAIKU__
-        // set sizes etc
-        uint32 size = sizeof(ContextData) * DRAFTER_MAX_CONTEXTS + sizeof(uint32);
-        if (size > B_PAGE_SIZE)
+        // get a messenger for the gfx_server
+        status_t error;
+        if (server_msgr == NULL)
         {
-                //panic("Drafter context area size larger than page size\n");
-cout<<"Context area size larger than page size"<<endl;
-                return D_ERR_NO_CONTEXT_AVAILABLE;
-        }
-
-        // check if we already know about an existing area
-        if (context_area == B_ERROR)
-        {
-                char* temp_addr = NULL;
-                // check if an area already exists
-                area_id temp_area = find_area(CONTEXT_AREA_NAME);
-                // if not, create one, then clone it
-                if (temp_area == B_NAME_NOT_FOUND)
+                server_msgr = new BMessenger("application/x-vnd.Drafter-gfx-server", -1, &error);
+                if (error != B_OK)
                 {
-                        // create a new area
-                        temp_area = create_area(CONTEXT_AREA_NAME, &(void*)temp_addr, B_ANY_ADDRESS, B_PAGE_SIZE, B_CONTIGUOUS, B_READ_AREA | B_WRITE_AREA);
-cout<<"Creating Area: "<<temp_area<<endl;
-                }
-                // clone the area
-                context_area = clone_area(CONTEXT_AREA_CLONE_NAME, &(void*)context_addr, B_ANY_ADDRESS, B_READ_AREA | B_WRITE_AREA, temp_area);
-                // increment usage counter
-                if (context_area < B_OK)
-                {
-cout<<"Cannot clone area"<<endl;
-                        return D_ERR_NO_CONTEXT_AVAILABLE;
-                }
-                contexts = (ContextData*)context_addr;
-                contextCount = (uint32*)context_addr + sizeof(ContextData) * DRAFTER_MAX_CONTEXTS;
-                *contextCount++;
-        }
-#endif
-        // TODO: add locking
-        bool foundcontext = false;
-        int a;
-        for (a = 0; a < DRAFTER_MAX_CONTEXTS; a++)
-        {
-                if ((contexts[a].flags & DRAFTER_CONTEXT_USED) == 0)
-                {
-                        // use this context!
-                        contexts[a].flags |= DRAFTER_CONTEXT_USED;
-                        foundcontext = true;
-                        break;
+                        return 0xdeadbeef;
                 }
         }
-        if (foundcontext == false)
-        {
-                a = D_ERR_NO_CONTEXT_AVAILABLE;
-        }
-        return a;
+        // TODO: send a request for a new context
+        BMessage request(D_CREATE_CONTEXT);
+        BMessage reply;
+        //BMessage* reply = new BMessage(D_REPLY);
+        server_msgr->SendMessage(&request, &reply);
+
+        // TODO: retrieve the resuls
+        uint32 contextnum;
+        reply.FindInt32("contextid", 0, &((int32)contextnum));
+        cout<<"Context returned: "<< contextnum << endl;
+        return contextnum;
 }
 
@@ -72 +41 @@
 SwitchContext(uint32 context)
 {
+        /*
         if (context < DRAFTER_MAX_CONTEXTS)
         {
@@ -81 +51 @@
         }
         return D_ERR_BAD_CONTEXT_ID;
+        */
+        return 0;
 }
 
@@ -88 +60 @@
 // TODO: add locking
 // TODO: check the teamID too
-        if (context < DRAFTER_MAX_CONTEXTS)
+/*      if (context < DRAFTER_MAX_CONTEXTS)
         {
                 if (contexts[context].flags & DRAFTER_CONTEXT_USED)
@@ -97 +69 @@
         }
         return D_ERR_BAD_CONTEXT_ID;
+        */
+        return 0;
 }

src/test_lib/lib3DStack.pld

@@ -7 +7 @@
 SOURCEFILE=context.cpp
 DEPENDENCY=/boot/home/Desktop/My Sources/lib3DStack/Drafter.h|/boot/home/Desktop/My Sources/lib3DStack/DrafterPrivateDefs.h
-LOCALINCLUDE=
 SYSTEMINCLUDE=/boot/develop/headers/be
 SYSTEMINCLUDE=/boot/develop/headers/cpp