communication: source clean-up

delete unused code, fix indenting and
add some logs

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

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 a003783b2a7733227778f71b5d1ac8b6691ee337..9b27139d355354445279b548a253c056d3543936 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
@@ -61,6 +61,7 @@ import org.tizen.emulator.skin.util.SkinUtil;
 import org.tizen.emulator.skin.util.SwtUtil;
 
 public class EmulatorShmSkin extends EmulatorSkin {
+       public static final String JNI_LIBRARY_FILE = "shared";
        public static final int DISPLAY_COLOR_DEPTH = 24; /* no need to Alpha channel */
 
        /* touch values */
@@ -73,19 +74,20 @@ public class EmulatorShmSkin extends EmulatorSkin {
        static {
                /* load JNI library file */
                try {
-                       System.loadLibrary("shared");
+                       System.loadLibrary(JNI_LIBRARY_FILE);
                } catch (UnsatisfiedLinkError e) {
-                       logger.info("Failed to load a JNI library file.\n" + e);
+                       logger.severe("Failed to load a " + JNI_LIBRARY_FILE + " file.\n" + e);
 
                        Shell temp = new Shell(Display.getDefault());
                        MessageBox messageBox = new MessageBox(temp, SWT.ICON_ERROR);
                        messageBox.setText("Emulator");
                        messageBox.setMessage(
-                                       "Failed to load a JNI library file.\n\n" + e);
+                                       "Failed to load a JNI library file from "
+                                       + System.getProperty("java.library.path") + ".\n\n" + e);
                        messageBox.open();
                        temp.dispose();
 
-                       EmulatorSkinMain.terminateImmediately(-1);;
+                       EmulatorSkinMain.terminateImmediately(-1);
                }
        }
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index 6acf04c2dc93b2f595c0e874bc45d260fe55e01f..b277352225dc1595fa5ebb275edd30d6ef3aeb7d 100755 (executable)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -76,7 +76,6 @@ import org.tizen.emulator.skin.comm.ICommunicator.MouseEventType;
 import org.tizen.emulator.skin.comm.ICommunicator.RotationInfo;
 import org.tizen.emulator.skin.comm.ICommunicator.SendCommand;
 import org.tizen.emulator.skin.comm.sock.SocketCommunicator;
-import org.tizen.emulator.skin.comm.sock.SocketCommunicator.DataTranfer;
 import org.tizen.emulator.skin.comm.sock.data.BooleanData;
 import org.tizen.emulator.skin.comm.sock.data.DisplayStateData;
 import org.tizen.emulator.skin.comm.sock.data.KeyEventData;
@@ -1731,6 +1730,8 @@ public class EmulatorSkin {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                if (communicator.isSdbDaemonStarted() == false) {
+                                       logger.warning("SDB is not ready.");
+
                                        SkinUtil.openMessage(shell, null,
                                                        "SDB is not ready.\n"
                                                                        + "Please wait until the emulator is completely boot up.",
@@ -1796,13 +1797,16 @@ public class EmulatorSkin {
                SelectionAdapter listener = new SelectionAdapter() {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
-                               /* if (communicator.isEcsServerStarted() == false) {
-                                       SkinUtil.openMessage(shell, null,
+                               if (communicator.isSdbDaemonStarted() == false) {
+//                                             || communicator.isEcsServerStarted() == false) {
+                                       logger.warning("Control Panel is not ready.");
+
+                                       SkinUtil.openMessage(shell,null,
                                                        "Control Panel is not ready.\n"
                                                        + "Please wait until the emulator is completely boot up.",
                                                        SWT.ICON_WARNING, config);
                                        return;
-                               } */
+                               }
 
                                String ecpPath = SkinUtil.getEcpPath();
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java
index 7bef8dfc6c734fa70a5aef3d69302dbd2c0d5719..f16cf1aa7a2a926380f0422ebd8a2393a4077c12 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/ICommunicator.java
@@ -1,7 +1,7 @@
 /**
  * Communication Interface Between Qemu And Skin
  *
- * Copyright (C) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact:
  * GiWoong Kim <giwoong.kim@samsung.com>
@@ -249,7 +249,6 @@ public interface ICommunicator extends Runnable {
                RECV_RAMDUMP_COMPLETED((short) 4),
                RECV_BOOTING_PROGRESS((short) 5),
                RECV_BRIGHTNESS_STATE((short) 6),
-               RECV_ECP_PORT_DATA((short) 7),
                RECV_HOST_KBD_STATE((short) 8),
                RECV_MULTI_TOUCH_STATE((short) 9),
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
index f1a9113208823e0adbf0c5754ed3b01b830b0b94..1e67dfaafaabdd7a3144701ca698868a2a02063e 100755 (executable)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/comm/sock/SocketCommunicator.java
@@ -118,7 +118,6 @@ public class SocketCommunicator implements ICommunicator {
        private DataTranfer screenShotDataTransfer;
        private DataTranfer detailInfoTransfer;
        private DataTranfer miscDataTransfer;
-       private DataTranfer ecpTransfer;
 
        private Thread sendThread;
        private LinkedList<SkinSendData> sendQueue;
@@ -146,10 +145,6 @@ public class SocketCommunicator implements ICommunicator {
                this.miscDataTransfer.sleep = SHORT_WAIT_INTERVAL;
                this.miscDataTransfer.maxWaitTime = SHORT_WAIT_LIMIT;
 
-               this.ecpTransfer = new DataTranfer();
-               this.ecpTransfer.sleep = LONG_WAIT_INTERVAL;
-               this.ecpTransfer.maxWaitTime = LONG_WAIT_LIMIT;
-
                this.heartbeatCount = new AtomicInteger(0);
                //this.heartbeatExecutor = Executors.newSingleThreadScheduledExecutor();
                this.heartbeatTimer = new Timer();
@@ -372,12 +367,6 @@ public class SocketCommunicator implements ICommunicator {
 
                                        break;
                                }
-                               case RECV_ECP_PORT_DATA: {
-                                       logger.info("received ECP_PORT_DATA from QEMU");
-                                       receiveData(sockInputStream, ecpTransfer, length);
-
-                                       break;
-                               }
                                case RECV_HOST_KBD_STATE: {
                                        logger.info("received HOST_KBD_STATE from QEMU");
 

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index 4752ca2d24e7d30ea665ed4af2e5397e1a5c9804..718ec33917484a75efc1ccc705fdc896f7c0efd2 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -129,7 +129,6 @@ enum {
     SEND_RAMDUMP_COMPLETED = 4,
     SEND_BOOTING_PROGRESS = 5,
     SEND_BRIGHTNESS_STATE = 6,
-    SEND_ECP_PORT_DATA = 7,
     SEND_HOST_KBD_STATE = 8,
     SEND_MULTI_TOUCH_STATE = 9,
 
@@ -792,31 +791,29 @@ static void* run_skin_server(void* args)
                 log_cnt += sprintf(log_buf + log_cnt,
                     "uid:%d, req_id:%d, cmd:%d, length:%d ", uid, req_id, cmd, length);
 
-                if ( 0 < length ) {
-
-                    if ( RECV_BUF_SIZE < length ) {
-                        ERR( "length is bigger than RECV_BUF_SIZE\n" );
+                if (0 < length) {
+                    if (RECV_BUF_SIZE < length) {
+                        ERR("length is bigger than RECV_BUF_SIZE\n");
                         continue;
                     }
 
-                    memset( &recvbuf, 0, length );
+                    memset(&recvbuf, 0, length);
 
-                    int recv_cnt = recv_n( client_sock, recvbuf, length );
+                    int recv_cnt = recv_n(client_sock, recvbuf, length);
 
-                    log_cnt += sprintf( log_buf + log_cnt, "data read_cnt:%d ", recv_cnt );
+                    log_cnt += sprintf(log_buf + log_cnt, "data read_cnt:%d ", recv_cnt);
 
-                    if ( 0 > recv_cnt ) {
-                        ERR( "skin_server read data\n" );
-                        perror( "skin_server read data : " );
+                    if (0 > recv_cnt) {
+                        ERR("skin_server read data\n");
+                        perror("skin_server read data : ");
                         break;
-                    } else if ( 0 == recv_cnt ) {
-                        ERR( "data read_cnt is 0.\n" );
+                    } else if (0 == recv_cnt) {
+                        ERR("data read_cnt is 0.\n");
                         break;
-                    } else if ( recv_cnt != length ) {
-                        ERR( "read_cnt is not equal to length.\n" );
+                    } else if (recv_cnt != length) {
+                        ERR("read_cnt is not equal to length.\n");
                         break;
                     }
-
                 }
 
                 switch (cmd) {