shm: The code of shared framebuffer is moved

The code of shared framebuffer is moved
from maru_vga.c into maru_shm.c

Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/emulator.h b/tizen/src/emulator.h
index d487892bf0fda64e3044bc0cfb27ef40049c707a..2ddddb97c76572e0764a148920e43fd120769870 100644 (file)
--- a/tizen/src/emulator.h
+++ b/tizen/src/emulator.h
@@ -43,7 +43,7 @@
 
 #define MAXLEN  512
 #define MAXPACKETLEN 60
-#define SHMKEY 26099
+//#define SHMKEY 26099
 
 extern gchar bin_path[];
 extern gchar log_path[];
@@ -55,4 +55,5 @@ void prepare_maru(void);
 const gchar * get_log_path(void);
 const gchar * prepare_maru_devices(const gchar * kernel_cmdline);
 int maru_device_check(QemuOpts *opts);
+
 #endif /* __EMULATOR_H__ */

diff --git a/tizen/src/hw/maru_vga.c b/tizen/src/hw/maru_vga.c
index b932e039c7b2a6fcb73072aa580fdbce8740f0bc..ca0d5b78e50f7858aa4ed106afef82e5bcd277ee 100644 (file)
--- a/tizen/src/hw/maru_vga.c
+++ b/tizen/src/hw/maru_vga.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact:
+ * JinHyung Jo <jinhyung.jo@samsung.com>
  * GiWoong Kim <giwoong.kim@samsung.com>
  * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
  * HyunJun Son
@@ -45,30 +46,12 @@
 #include "maru_vga_int.h"
 #include "maru_brightness.h"
 #include "maru_overlay.h"
-#include "maru_display.h"
 #include "emul_state.h"
 #include "debug_ch.h"
 #include <pthread.h>
 
-#ifdef CONFIG_USE_SHM
-#include "emulator.h"
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include "maru_err_table.h"
-#include "emul_state.h"
-#endif
-
-#ifdef CONFIG_USE_SHM
-void *shared_memory = (void*) 0;
-int skin_shmid;
-#endif
-
-
 MULTI_DEBUG_CHANNEL(qemu, maru_vga);
 
-extern pthread_mutex_t mutex_screenshot;
-extern pthread_cond_t cond_screenshot;
 
 //#define DEBUG_VGA
 //#define DEBUG_VGA_MEM
@@ -1488,34 +1471,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
         d += linesize;
     }
 
-//TODO: maru_shm
-#ifdef CONFIG_USE_SHM
-    /* for display updating */
-    memcpy(shared_memory, s->ds->surface->data,
-        s->ds->surface->linesize * s->ds->surface->height);
-#endif
-
-//TODO: maru_sdl
-#ifndef CONFIG_USE_SHM
-    /* for screenshot */
-    pthread_mutex_lock(&mutex_screenshot);
-
-    MaruScreenshot* maru_screenshot = get_maru_screenshot();
-    if (maru_screenshot) {
-        maru_screenshot->isReady = 1;
-
-        if (maru_screenshot->request_screenshot == 1) {
-            memcpy(maru_screenshot->pixel_data, s->ds->surface->data, 
-                s->ds->surface->linesize * s->ds->surface->height);
-            maru_screenshot->request_screenshot = 0;
-
-            pthread_cond_signal(&cond_screenshot);
-        }
-    }
-
-    pthread_mutex_unlock(&mutex_screenshot);
-#endif
-
     if (y_start >= 0) {
         /* flush to display */
         dpy_update(s->ds, 0, y_start,
@@ -1880,51 +1835,12 @@ void maru_vga_common_init(VGACommonState *s)
         break;
     }
     vga_dirty_log_start(s);
-
-#ifdef CONFIG_USE_SHM
-    /* base + 1 = sdb port */
-    /* base + 2 = shared memory key */
-    int mykey = get_emul_vm_base_port() + 2;
-
-    INFO("shared memory key: %d, vga ram_size : %d\n", mykey, s->vram_size);
-
-    skin_shmid = shmget((key_t)mykey, (size_t)s->vram_size, 0666 | IPC_CREAT);
-    if (skin_shmid == -1) {
-        ERR("shmget failed\n");
-        perror("maru_vga: ");
-        maru_register_exit_msg(MARU_EXIT_UNKNOWN,
-            (char*) "Cannot launch this VM.\n"
-            "Shared memory is not enough.");
-        exit(0);
-    }
-
-    shared_memory = shmat(skin_shmid, (void*)0, 0);
-    if (shared_memory == (void *)-1) {
-        ERR("shmat failed\n");
-        perror("maru_vga: ");
-        exit(1);
-    }
-
-    memset(shared_memory, 0x00, (size_t)s->vram_size);
-    printf("Memory attached at %X\n", (int)shared_memory);
-#endif
-
 }
 
-#ifdef CONFIG_USE_SHM
 void maru_vga_common_fini(void)
 {
-    if (shmdt(shared_memory) == -1) {
-        ERR("shmdt failed\n");
-        perror("maru_vga: ");
-    }
-
-    if (shmctl(skin_shmid, IPC_RMID, 0) == -1) {
-        ERR("shmctl failed\n");
-        perror("maru_vga: ");
-    }
+    /* do nothing */
 }
-#endif
 
 static const MemoryRegionPortio vga_portio_list[] = {
     { 0x04,  2, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3b4 */

diff --git a/tizen/src/hw/maru_vga_int.h b/tizen/src/hw/maru_vga_int.h
index fa0e9472233b9a543e1bbf39e50719188358ac69..65221c51110173b62be429374a66b9f343486e2f 100644 (file)
--- a/tizen/src/hw/maru_vga_int.h
+++ b/tizen/src/hw/maru_vga_int.h
@@ -32,6 +32,8 @@
 #define MARU_VGA_INT_H_
 
 void maru_vga_common_init(VGACommonState *s);
+void maru_vga_common_fini(void);
+
 
 void maru_vga_draw_cursor_line_8(uint8_t *d1, const uint8_t *src1,
                             int poffset, int w,

diff --git a/tizen/src/maru_display.c b/tizen/src/maru_display.c
index 48d49b839179cb5b008fc9ca9281d6289c42b403..66ff193dd219adb44506336be7c95f6e22f22da5 100644 (file)
--- a/tizen/src/maru_display.c
+++ b/tizen/src/maru_display.c
@@ -85,13 +85,12 @@ void maru_display_fini(void)
 #ifndef CONFIG_USE_SHM
     maruskin_sdl_quit();
 #else
-#if defined(TARGET_I386)
-    maru_vga_common_fini();
-#endif
+    maruskin_shm_quit();
 #endif
 }
 
-void maruskin_init(uint64 swt_handle, int lcd_size_width, int lcd_size_height, bool is_resize)
+void maruskin_init(uint64 swt_handle,
+    int lcd_size_width, int lcd_size_height, bool is_resize)
 {
 #ifndef CONFIG_USE_SHM
     maruskin_sdl_init(swt_handle, lcd_size_width, lcd_size_height, is_resize);

diff --git a/tizen/src/maru_sdl.c b/tizen/src/maru_sdl.c
index 9fbec5c4a83d057701d2e3087e3fccab19bd15d7..8775c69bb24dfc65ca7f783ca48b40fa06dc4d10 100644 (file)
--- a/tizen/src/maru_sdl.c
+++ b/tizen/src/maru_sdl.c
@@ -32,6 +32,7 @@
 #include <math.h>
 #include "console.h"
 #include "maru_sdl.h"
+#include "maru_display.h"
 #include "emul_state.h"
 #include "SDL_gfx/SDL_rotozoom.h"
 #include "maru_sdl_rotozoom.h"
@@ -74,6 +75,9 @@ static pthread_cond_t sdl_cond = PTHREAD_COND_INITIALIZER;
 static int sdl_thread_initialized;
 #endif
 
+extern pthread_mutex_t mutex_screenshot;
+extern pthread_cond_t cond_screenshot;
+
 #define SDL_FLAGS (SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_NOFRAME)
 #define SDL_BPP 32
 
@@ -89,6 +93,24 @@ void qemu_ds_sdl_update(DisplayState *ds, int x, int y, int w, int h)
 #else
     qemu_update();
 #endif
+
+    /* for screenshot */
+    pthread_mutex_lock(&mutex_screenshot);
+
+    MaruScreenshot* maru_screenshot = get_maru_screenshot();
+    if (maru_screenshot) {
+        maru_screenshot->isReady = 1;
+
+        if (maru_screenshot->request_screenshot == 1) {
+            memcpy(maru_screenshot->pixel_data, ds->surface->data,
+                ds->surface->linesize * ds->surface->height);
+            maru_screenshot->request_screenshot = 0;
+
+            pthread_cond_signal(&cond_screenshot);
+        }
+    }
+
+    pthread_mutex_unlock(&mutex_screenshot);
 }
 
 void qemu_ds_sdl_resize(DisplayState *ds)

diff --git a/tizen/src/maru_shm.c b/tizen/src/maru_shm.c
index dc9e9619a94f598f4485e71173cb4e69a9c67ab6..7a1577b4dbecc6e584cac4df5efbd3c18b6ad6be 100644 (file)
--- a/tizen/src/maru_shm.c
+++ b/tizen/src/maru_shm.c
@@ -1,7 +1,7 @@
 /*
  * Shared memory
  *
- * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact:
  * GiWoong Kim <giwoong.kim@samsung.com>
@@ -32,12 +32,23 @@
 #include "emul_state.h"
 #include "debug_ch.h"
 
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include "maru_err_table.h"
+
 MULTI_DEBUG_CHANNEL(tizen, maru_shm);
 
 
+void *shared_memory = (void*) 0;
+int skin_shmid;
+
 void qemu_ds_shm_update(DisplayState *ds, int x, int y, int w, int h)
 {
-    //TODO:
+    if (shared_memory != NULL) {
+        memcpy(shared_memory, ds->surface->data,
+            ds->surface->linesize * ds->surface->height);
+    }
 }
 
 void qemu_ds_shm_resize(DisplayState *ds)
@@ -50,7 +61,8 @@ void qemu_ds_shm_refresh(DisplayState *ds)
     vga_hw_update();
 }
 
-void maruskin_shm_init(uint64 swt_handle, int lcd_size_width, int lcd_size_height, bool is_resize)
+void maruskin_shm_init(uint64 swt_handle,
+    int lcd_size_width, int lcd_size_height, bool is_resize)
 {
     INFO("maru shm initialization = %d\n", is_resize);
 
@@ -58,5 +70,51 @@ void maruskin_shm_init(uint64 swt_handle, int lcd_size_width, int lcd_size_heigh
         set_emul_lcd_size(lcd_size_width, lcd_size_height);
         set_emul_sdl_bpp(32);
     }
+
+    /* byte */
+    int shm_size =
+        get_emul_lcd_width() * get_emul_lcd_height() * 4;
+
+    /* base + 1 = sdb port */
+    /* base + 2 = shared memory key */
+    int mykey = get_emul_vm_base_port() + 2;
+
+    INFO("shared memory key: %d, vga ram_size : %d\n", mykey, shm_size);
+
+    /* make a shared framebuffer */
+    skin_shmid = shmget((key_t)mykey, (size_t)shm_size, 0666 | IPC_CREAT);
+    if (skin_shmid == -1) {
+        ERR("shmget failed\n");
+        perror("maru_vga: ");
+
+        maru_register_exit_msg(MARU_EXIT_UNKNOWN,
+            (char*) "Cannot launch this VM.\n"
+            "Shared memory is not enough.");
+        exit(0);
+    }
+
+    shared_memory = shmat(skin_shmid, (void*)0, 0);
+    if (shared_memory == (void *)-1) {
+        ERR("shmat failed\n");
+        perror("maru_vga: ");
+        exit(1);
+    }
+
+    /* default screen */
+    memset(shared_memory, 0x00, (size_t)shm_size);
+    printf("Memory attached at %X\n", (int)shared_memory);
+}
+
+void maruskin_shm_quit(void)
+{
+    if (shmdt(shared_memory) == -1) {
+        ERR("shmdt failed\n");
+        perror("maru_vga: ");
+    }
+
+    if (shmctl(skin_shmid, IPC_RMID, 0) == -1) {
+        ERR("shmctl failed\n");
+        perror("maru_vga: ");
+    }
 }
 

diff --git a/tizen/src/maru_shm.h b/tizen/src/maru_shm.h
index 12035b4aff664d817c5a67467da8401991f71ccb..1e7e6c5ceeefc3123b9391959892b239accec0f6 100644 (file)
--- a/tizen/src/maru_shm.h
+++ b/tizen/src/maru_shm.h
@@ -1,7 +1,7 @@
 /*
  * Shared memory
  *
- * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact:
  * GiWoong Kim <giwoong.kim@samsung.com>
@@ -37,6 +37,9 @@
 void qemu_ds_shm_update(DisplayState *ds, int x, int y, int w, int h);
 void qemu_ds_shm_resize(DisplayState *ds);
 void qemu_ds_shm_refresh(DisplayState *ds);
-void maruskin_shm_init(uint64 swt_handle, int lcd_size_width, int lcd_size_height, bool is_resize);
+
+void maruskin_shm_init(uint64 swt_handle,
+    int lcd_size_width, int lcd_size_height, bool is_resize);
+void maruskin_shm_quit(void);
 
 #endif /* MARU_SHM_H_ */

diff --git a/tizen/src/skin/client/native_src/share.c b/tizen/src/skin/client/native_src/share.c
index 3e103bb49870b25fc7951610dfff18430f65441c..5f17212d56e944db016f54f714b36b3579d632e7 100644 (file)
--- a/tizen/src/skin/client/native_src/share.c
+++ b/tizen/src/skin/client/native_src/share.c
@@ -44,7 +44,7 @@ int shmid;
 JNIEXPORT jint JNICALL Java_org_tizen_emulator_skin_EmulatorShmSkin_shmget
     (JNIEnv *env, jobject obj, jint shmkey, jint vga_ram_size)
 {
-    fprintf(stdout, "share.c: shared memory key = %d\n", shmkey);
+    fprintf(stdout, "share.c: shared memory key = %d, size=%d\n", shmkey, vga_ram_size);
     fflush(stdout);
 
     shmid = shmget((key_t)shmkey, (size_t)vga_ram_size, 0666 | IPC_CREAT);

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
index c88c77d6c2c67537c1a4b856bd07170cded3a037..4ecd5dcade04f7d849b2cc911d82f466b5aaef16 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
@@ -188,7 +188,7 @@ public class EmulatorShmSkin extends EmulatorSkin {
                /* initialize shared memory */
                int result = shmget(shmkey,
                                currentState.getCurrentResolutionWidth() *
-                               currentState.getCurrentResolutionHeight());
+                               currentState.getCurrentResolutionHeight() * 4);
                logger.info("shmget native function returned " + result);
 
                /* update lcd thread */