sdb: arrange source codes

Remove unnecessary error handling process

Signed-off-by: munkyu.im <munkyu.im@samsung.com>

diff --git a/tizen/src/sdb.c b/tizen/src/sdb.c
index 568a32b24d6c12dcdf3345f94f406a1e6ca17cad..26bbea8fe1b0128460bd98f65909092deacafa3d 100644 (file)
--- a/tizen/src/sdb.c
+++ b/tizen/src/sdb.c
@@ -11,18 +11,6 @@
 */\r
 \r
 \r
-#ifdef _WIN32\r
-#include <windows.h>\r
-#include <winsock2.h>\r
-#include <ws2tcpip.h>\r
-#else /* !_WIN32 */\r
-#include <sys/ioctl.h>\r
-#include <sys/socket.h>\r
-#include <netinet/in.h>\r
-#include <netinet/tcp.h>\r
-#include <netdb.h>\r
-#endif /* !_WIN32 */\r
-\r
 #include "emulator.h"\r
 #include "net/slirp.h"\r
 #include "qemu_socket.h"\r
@@ -30,129 +18,14 @@
 #include "nbd.h"\r
 #include "tizen/src/debug_ch.h"\r
 \r
-//DEFAULT_DEBUG_CHANNEL(qemu);\r
 MULTI_DEBUG_CHANNEL(qemu, sdb);\r
 \r
 extern char tizen_target_path[];\r
 extern int tizen_base_port;\r
 \r
-/* QSOCKET_CALL is used to deal with the fact that EINTR happens pretty\r
- * easily in QEMU since we use SIGALRM to implement periodic timers\r
- */\r
-\r
-#ifdef _WIN32\r
-#  define  QSOCKET_CALL(_ret,_cmd)   \\r
-       do { _ret = (_cmd); } while ( _ret < 0 && WSAGetLastError() == WSAEINTR )\r
-#else\r
-#  define  QSOCKET_CALL(_ret,_cmd)   \\r
-       do { \\r
-               errno = 0; \\r
-               do { _ret = (_cmd); } while ( _ret < 0 && errno == EINTR ); \\r
-       } while (0);\r
-#endif\r
-\r
-#ifdef _WIN32\r
-\r
-#include <errno.h>\r
-\r
-static int  winsock_error;\r
-\r
-#define  WINSOCK_ERRORS_LIST \\r
-       EE(WSA_INVALID_HANDLE,EINVAL,"invalid handle") \\r
-EE(WSA_NOT_ENOUGH_MEMORY,ENOMEM,"not enough memory") \\r
-EE(WSA_INVALID_PARAMETER,EINVAL,"invalid parameter") \\r
-EE(WSAEINTR,EINTR,"interrupted function call") \\r
-EE(WSAEALREADY,EALREADY,"operation already in progress") \\r
-EE(WSAEBADF,EBADF,"bad file descriptor") \\r
-EE(WSAEACCES,EACCES,"permission denied") \\r
-EE(WSAEFAULT,EFAULT,"bad address") \\r
-EE(WSAEINVAL,EINVAL,"invalid argument") \\r
-EE(WSAEMFILE,EMFILE,"too many opened files") \\r
-EE(WSAEWOULDBLOCK,EWOULDBLOCK,"resource temporarily unavailable") \\r
-EE(WSAEINPROGRESS,EINPROGRESS,"operation now in progress") \\r
-EE(WSAEALREADY,EAGAIN,"operation already in progress") \\r
-EE(WSAENOTSOCK,EBADF,"socket operation not on socket") \\r
-EE(WSAEDESTADDRREQ,EDESTADDRREQ,"destination address required") \\r
-EE(WSAEMSGSIZE,EMSGSIZE,"message too long") \\r
-EE(WSAEPROTOTYPE,EPROTOTYPE,"wrong protocol type for socket") \\r
-EE(WSAENOPROTOOPT,ENOPROTOOPT,"bad protocol option") \\r
-EE(WSAEADDRINUSE,EADDRINUSE,"address already in use") \\r
-EE(WSAEADDRNOTAVAIL,EADDRNOTAVAIL,"cannot assign requested address") \\r
-EE(WSAENETDOWN,ENETDOWN,"network is down") \\r
-EE(WSAENETUNREACH,ENETUNREACH,"network unreachable") \\r
-EE(WSAENETRESET,ENETRESET,"network dropped connection on reset") \\r
-EE(WSAECONNABORTED,ECONNABORTED,"software caused connection abort") \\r
-EE(WSAECONNRESET,ECONNRESET,"connection reset by peer") \\r
-EE(WSAENOBUFS,ENOBUFS,"no buffer space available") \\r
-EE(WSAEISCONN,EISCONN,"socket is already connected") \\r
-EE(WSAENOTCONN,ENOTCONN,"socket is not connected") \\r
-EE(WSAESHUTDOWN,ESHUTDOWN,"cannot send after socket shutdown") \\r
-EE(WSAETOOMANYREFS,ETOOMANYREFS,"too many references") \\r
-EE(WSAETIMEDOUT,ETIMEDOUT,"connection timed out") \\r
-EE(WSAECONNREFUSED,ECONNREFUSED,"connection refused") \\r
-EE(WSAELOOP,ELOOP,"cannot translate name") \\r
-EE(WSAENAMETOOLONG,ENAMETOOLONG,"name too long") \\r
-EE(WSAEHOSTDOWN,EHOSTDOWN,"host is down") \\r
-EE(WSAEHOSTUNREACH,EHOSTUNREACH,"no route to host") \\r
-\r
-typedef struct {\r
-       int          winsock;\r
-       int          unix;\r
-       const char*  string;\r
-} WinsockError;\r
-\r
-static const WinsockError  _winsock_errors[] = {\r
-#define  EE(w,u,s)   { w, u, s },\r
-       WINSOCK_ERRORS_LIST\r
-#undef   EE\r
-       { -1, -1, NULL }\r
-};\r
-\r
-/* this function reads the latest winsock error code and updates\r
- * errno to a matching value. It also returns the new value of\r
- * errno.\r
- */\r
-static int _fix_errno( void )\r
-{\r
-       const WinsockError*  werr = _winsock_errors;\r
-       int                  unix = EINVAL;  /* generic error code */\r
-\r
-       winsock_error = WSAGetLastError();\r
-\r
-       for ( ; werr->string != NULL; werr++ ) {\r
-               if (werr->winsock == winsock_error) {\r
-                       unix = werr->unix;\r
-                       break;\r
-               }\r
-       }\r
-       errno = unix;\r
-       return -1;\r
-}\r
-\r
-#else\r
-static int _fix_errno( void )\r
-{\r
-       return -1;\r
-}\r
-\r
-#endif\r
-\r
-#define  SOCKET_CALL(cmd)  \\r
-       int  ret; \\r
-QSOCKET_CALL(ret, (cmd)); \\r
-if (ret < 0) \\r
-return _fix_errno(); \\r
-return ret; \\r
-\r
-int socket_send(int  fd, const void*  buf, int  buflen)\r
-{\r
-       SOCKET_CALL(send(fd, buf, buflen, 0))\r
-}\r
-\r
 #ifdef _WIN32\r
 \r
-       static void\r
-socket_close_handler( void*  _fd )\r
+static void socket_close_handler( void*  _fd )\r
 {\r
        int   fd = (int)_fd;\r
        int   ret;\r
@@ -170,8 +43,7 @@ socket_close_handler( void*  _fd )
        closesocket( fd );\r
 }\r
 \r
-       void\r
-socket_close( int  fd )\r
+void socket_close( int  fd )\r
 {\r
        int  old_errno = errno;\r
 \r
@@ -186,8 +58,7 @@ socket_close( int  fd )
 \r
 #include <unistd.h>\r
 \r
-       void\r
-socket_close( int  fd )\r
+void socket_close( int  fd )\r
 {\r
        int  old_errno = errno;\r
 \r
@@ -342,9 +213,9 @@ int sdb_loopback_client(int port, int type)
 }\r
 \r
 void notify_sdb_daemon_start(void) {\r
-    \r
+\r
     int s;\r
-    /* \r
+    /*\r
      * send a simple message to the SDB host server to tell it we just started.\r
      * it should be listening on port 26099.\r
      */\r
@@ -363,12 +234,14 @@ void notify_sdb_daemon_start(void) {
     /* length is hex host:emulator:port: -> 0x13 = 20 */\r
     sprintf(tmp, "00%2xhost:emulator:%d:%s", 20 + strlen(targetname), tizen_base_port + 1, targetname);\r
     INFO("message to send to SDB server: %s\n", tmp);\r
-    if (socket_send(s, tmp, MAXPACKETLEN) < 0) {\r
+    if (send(s, tmp, MAXPACKETLEN,0) < 0) {\r
         ERR( "message sending to SDB server error!\n");\r
+        perror("sdb.c: ");\r
     }\r
 \r
-    if (s >= 0)\r
+    if (s >= 0){\r
         socket_close(s);\r
-   \r
+    }\r
+\r
     free(targetname);\r
 }\r

diff --git a/tizen/src/sdb.h b/tizen/src/sdb.h
index 91575d7587a1425b121ce14f5c5b3ccc1005a2f2..e85a69b591472c6028f6e5c2537b234c5867193a 100644 (file)
--- a/tizen/src/sdb.h
+++ b/tizen/src/sdb.h
@@ -14,91 +14,20 @@
 
 #include <errno.h>
 
-#define SDB_HOST_PORT 26099
-
 #ifdef _WIN32
-#  ifndef EINTR
-#    define EINTR        10004
-#  endif
-#  ifndef EAGAIN
-#    define EAGAIN       10035
-#  endif
-#  ifndef EWOULDBLOCK
-#    define EWOULDBLOCK  EAGAIN
-#  endif
-#  ifndef EINPROGRESS
-#    define EINPROGRESS  10036
-#  endif
-#  ifndef EALREADY
-#    define EALREADY     10037
-#  endif
-#  ifndef EDESTADDRREQ
-#    define EDESTADDRREQ 10039
-#  endif
-#  ifndef EMSGSIZE
-#    define EMSGSIZE     10040
-#  endif
-#  ifndef EPROTOTYPE
-#    define EPROTOTYPE   10041
-#  endif
-#  ifndef ENOPROTOOPT
-#    define ENOPROTOOPT  10042
-#  endif
-#  ifndef EAFNOSUPPORT
-#    define EAFNOSUPPORT 10047
-#  endif
-#  ifndef EADDRINUSE
-#    define EADDRINUSE   10048
-#  endif
-#  ifndef EADDRNOTAVAIL
-#    define EADDRNOTAVAIL 10049
-#  endif
-#  ifndef ENETDOWN
-#    define ENETDOWN     10050
-#  endif
-#  ifndef ENETUNREACH
-#    define ENETUNREACH  10051
-#  endif
-#  ifndef ENETRESET
-#    define ENETRESET    10052
-#  endif
-#  ifndef ECONNABORTED
-#    define ECONNABORTED 10053
-#  endif
-#  ifndef ECONNRESET
-#    define ECONNRESET   10054
-#  endif
-#  ifndef ENOBUFS
-#    define ENOBUFS      10055
-#  endif
-#  ifndef EISCONN
-#    define EISCONN      10056
-#  endif
-#  ifndef ENOTCONN
-#    define ENOTCONN     10057
-#  endif
-#  ifndef ESHUTDOWN
-#    define ESHUTDOWN     10058
-#  endif
-#  ifndef ETOOMANYREFS
-#    define ETOOMANYREFS  10059
-#  endif
-#  ifndef ETIMEDOUT
-#    define ETIMEDOUT     10060
-#  endif
-#  ifndef ECONNREFUSED
-#    define ECONNREFUSED  10061
-#  endif
-#  ifndef ELOOP
-#    define ELOOP         10062
-#  endif
-#  ifndef EHOSTDOWN
-#    define EHOSTDOWN     10064
-#  endif
-#  ifndef EHOSTUNREACH
-#    define EHOSTUNREACH  10065
-#  endif
-#endif /* _WIN32 */
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else /* !_WIN32 */
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+#endif /* !_WIN32 */
+
+
+#define SDB_HOST_PORT 26099
 
 #define SDB_TCP_EMULD_INDEX  3    /* emulator daemon port */
 #define SDB_TCP_OPENGL_INDEX  4   /* opengl server port */

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index a9d72a3e3cc1a1b25a248c204ee3d21885a2d9df..974a3fa54d3a049aa5de4be2f23f6d160554bc0c 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -565,7 +565,7 @@ static void* run_timed_shutdown_thread( void* args ) {
         ERR("shmctl failed\n");
         perror("maruskin_operation.c:g_shmid: ");
     }
-    
+
     if (shmctl(port_shmid, IPC_RMID, 0) == -1) {
         ERR("shmctl failed\n");
         perror("maruskin_operation.c:port_shmid: ");
@@ -588,9 +588,15 @@ static void send_to_emuld( const char* request_type, int request_size, const cha
         return;
     }
 
-    socket_send( s, (char*)request_type, request_size );
-    socket_send( s, &buf_size, 4 );
-    socket_send( s, (char*)send_buf, buf_size );
+    if(send( s, (char*)request_type, request_size, 0 ) < 0) {
+        ERR("failed to send to emuld\n");
+    }
+    if(send( s, &buf_size, 4, 0 ) < 0) {
+        ERR("failed to send to emuld\n");
+    }
+    send( s, (char*)send_buf, buf_size, 0 ) {
+        ERR("failed to send to emuld\n");
+    }
 
     INFO( "send to emuld [req_type:%s, send_data:%s, send_size:%d] 127.0.0.1:%d/tcp \n",
         request_type, send_buf, buf_size, tizen_base_port + SDB_TCP_EMULD_INDEX );