From f94f4d86218ce8fe5db2f8f241a7cc6231ff76e3 Mon Sep 17 00:00:00 2001 From: Son Hyunjun Date: Thu, 5 Apr 2012 15:47:37 +0900 Subject: [PATCH] [Title] change request id to be sequencial from random [Type] Enhancement [Module] Skin [Priority] Minor [CQ#] [Redmine#] [Problem] [Cause] [Solution] Change-Id: I9bf9d5e90f7ea32302089e4f1ba231fb4bd6e11c --- .../org/tizen/emulator/skin/comm/sock/SocketCommunicator.java | 9 ++++----- tizen/src/skin/maruskin_server.c | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) 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 01bd067..39446ff 100644 --- 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 @@ -36,7 +36,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.net.Socket; import java.net.UnknownHostException; -import java.util.UUID; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -95,6 +94,8 @@ public class SocketCommunicator implements ICommunicator { public static final int HEART_BEAT_INTERVAL = 1; //second public static final int HEART_BEAT_EXPIRE = 5; + private static int reqId; + private Logger logger = SkinLogger.getSkinLogger( SocketCommunicator.class ).getLogger(); private EmulatorConfig config; @@ -331,10 +332,8 @@ public class SocketCommunicator implements ICommunicator { try { - // anyway down casting - long longReqId = UUID.randomUUID().getMostSignificantBits(); - int reqId = (int) ( longReqId >> 32 ); - + reqId = ( Integer.MAX_VALUE == reqId ) ? 0 : ++reqId; + ByteArrayOutputStream bao = new ByteArrayOutputStream(); DataOutputStream dataOutputStream = new DataOutputStream( bao ); diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c index bd1aad5..fed9c53 100644 --- a/tizen/src/skin/maruskin_server.c +++ b/tizen/src/skin/maruskin_server.c @@ -54,6 +54,7 @@ MULTI_DEBUG_CHANNEL( qemu, maruskin_server ); +#define MAX_REQ_ID 0x7fffffff #define RECV_BUF_SIZE 32 #define RECV_HEADER_SIZE 12 @@ -94,6 +95,8 @@ enum { SEND_SHUTDOWN = 999, }; +static int seq_req_id = 0; + static uint16_t svr_port = 0; static int server_sock = 0; static int client_sock = 0; @@ -790,7 +793,7 @@ static void make_header( int client_sock, short send_cmd, int data_length, char* memset( sendbuf, 0, SEND_HEADER_SIZE ); - int request_id = rand(); + int request_id = ( MAX_REQ_ID == seq_req_id ) ? 0 : ++seq_req_id; TRACE( "== SEND skin request_id:%d, send_cmd:%d ==\n", request_id, send_cmd ); request_id = htonl( request_id ); -- 2.7.4