pedometer: removed pedometer sensor injection

Change-Id: Ie2e9a2df95230c563927f61e55b481341eec0ba2
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>

diff --git a/emuld.manifest b/emuld.manifest
new file mode 100644 (file)
index 0000000..e325658
--- /dev/null
+++ b/emuld.manifest
@@ -0,0 +1,11 @@
+<manifest>
+       <define>
+               <domain name="emuld"/>
+               <request>
+                       <smack request="deviced::display" type="rw" />
+               </request>
+       </define>
+       <request>
+               <domain name="emuld" />
+       </request>
+</manifest>

diff --git a/packaging/emuld.spec b/packaging/emuld.spec
index 6aa6d60ac825f16d7f022e10efd47871ad0ec558..2cc725d023b2e1508fd417b0efb279f645073c5a 100644 (file)
--- a/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@ -1,25 +1,16 @@
 Name: emuld
-Version: 0.8.0
+Version: 0.8.1
 Release: 0
 Summary: Emulator daemon
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz
 Group: SDK/Other
-%if "%{?tizen_profile_name}" == "mobile"
-Source1001: packaging/emuld_mobile.manifest
-%elseif "%{?tizen_profile_name}" == "wearable"
-Source1001: packaging/emuld_wearable.manifest
-%endif
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(deviced)
 BuildRequires: pkgconfig(dlog)
 
-%if "%{?tizen_profile_name}" == "wearable"
-Requires: context-manager
-%endif
-
 %description
 A emulator daemon is used for communication between guest and host
 
@@ -66,13 +57,7 @@ chmod 770 %{_prefix}/bin/emuld
 
 %files
 %defattr(-,root,root,-)
-
-%if "%{?tizen_profile_name}" == "mobile"
-%manifest packaging/emuld_mobile.manifest
-%elseif "%{?tizen_profile_name}" == "wearable"
-%manifest packaging/emuld_wearable.manifest
-%endif
-
+%manifest emuld.manifest
 %{_prefix}/bin/emuld
 /usr/share/license/%{name}
 /usr/lib/systemd/system/emuld.service

diff --git a/packaging/emuld_mobile.manifest b/packaging/emuld_mobile.manifest
deleted file mode 100644 (file)
index e325658..0000000
--- a/packaging/emuld_mobile.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest>
-       <define>
-               <domain name="emuld"/>
-               <request>
-                       <smack request="deviced::display" type="rw" />
-               </request>
-       </define>
-       <request>
-               <domain name="emuld" />
-       </request>
-</manifest>

diff --git a/packaging/emuld_wearable.manifest b/packaging/emuld_wearable.manifest
deleted file mode 100644 (file)
index 77c9616..0000000
--- a/packaging/emuld_wearable.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-<manifest>
-       <define>
-               <domain name="emuld"/>
-               <request>
-                       <smack request="deviced::display" type="rw" />
-                       <smack request="context-manager" type="w" />
-                       <smack request="system::use_internet" type="w" />
-                       <smack request="system::debugging_network" type="w" />
-               </request>
-               <permit>
-                       <smack permit="system::use_internet" type="w" />
-                       <smack permit="system::debugging_network" type="w" />
-               </permit>
-       </define>
-       <request>
-               <domain name="emuld" />
-       </request>
-</manifest>

diff --git a/src/wearable.cpp b/src/wearable.cpp
index 3871ca33fc442c9a9d074be36f5df8c9843c171c..312ddc89f1fbb256d1e7420240ef71d693763291 100644 (file)
--- a/src/wearable.cpp
+++ b/src/wearable.cpp
@@ -29,142 +29,10 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <arpa/inet.h>
-#include <unistd.h>
 
 #include "emuld.h"
 #include "wearable.h"
 
-enum
-{
-    fdtype_pedometer  = 3
-};
-
-#define PEDOMETER_PORT      3600
-
-#define IJTYPE_PEDOMETER    "pedometer"
-
-unsigned short pedometer_port = PEDOMETER_PORT;
-static int g_pedometer_connect_status;
-static pthread_mutex_t mutex_pedometerconnect = PTHREAD_MUTEX_INITIALIZER;
-
-bool is_pedometer_connected(void)
-{
-    _auto_mutex _(&mutex_pedometerconnect);
-
-    if (g_pedometer_connect_status != 1)
-        return false;
-
-    return true;
-}
-
-bool msgproc_pedometer(const int sockfd, ijcommand* ijcmd)
-{
-    int sent = 0;
-
-    LOGINFO("msgproc_pedometer");
-    if (!is_pedometer_connected() || !ijcmd->data)
-        return false;
-
-    LOGINFO("send data state: %s", ijcmd->data);
-
-    sent = send(g_fd[fdtype_pedometer], ijcmd->data, 1, 0);
-    if (sent == -1)
-    {
-        LOGERR("pedometer send error");
-    }
-
-    LOGDEBUG("sent to pedometer daemon: %d byte", sent);
-
-    return true;
-}
-
-void set_pedometer_connect_status(const int v)
-{
-    _auto_mutex _(&mutex_pedometerconnect);
-
-    g_pedometer_connect_status = v;
-}
-
-void* init_pedometer_connect(void* data)
-{
-    struct sockaddr_in pedometer_addr;
-    int ret = -1;
-
-    set_pedometer_connect_status(0);
-
-    LOGINFO("init_pedometer_connect start\n");
-
-    pthread_detach(pthread_self());
-    if ((g_fd[fdtype_pedometer] = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-        LOGERR("Server Start Fails. : Can't open stream socket \n");
-        exit(0);
-    }
-
-    memset(&pedometer_addr , 0 , sizeof(pedometer_addr)) ;
-
-    pedometer_addr.sin_family = AF_INET;
-    pedometer_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
-    pedometer_addr.sin_port = htons(pedometer_port);
-
-    while (ret < 0 && !exit_flag)
-    {
-        ret = connect(g_fd[fdtype_pedometer], (struct sockaddr *)&pedometer_addr, sizeof(pedometer_addr));
-
-        LOGINFO("pedometer_sockfd: %d, connect ret: %d\n", g_fd[fdtype_pedometer], ret);
-
-        if(ret < 0) {
-            LOGERR("connection failed to pedometer! try \n");
-            sleep(1);
-        }
-    }
-
-    epoll_ctl_add(g_fd[fdtype_pedometer]);
-
-    set_pedometer_connect_status(1);
-
-    pthread_exit((void *) 0);
-}
-
-void recv_from_pedometer(int fd)
-{
-    printf("recv_from_pedometer\n");
-
-    ijcommand ijcmd;
-    if (!read_ijcmd(fd, &ijcmd))
-    {
-        LOGERR("fail to read ijcmd\n");
-
-        set_pedometer_connect_status(0);
-
-        close(fd);
-
-        if (pthread_create(&tid[TID_PEDOMETER], NULL, init_pedometer_connect, NULL) != 0)
-        {
-            LOGERR("pthread create fail!");
-        }
-        return;
-    }
-
-    LOGDEBUG("pedometer data length: %d", ijcmd.msg.length);
-    const int tmplen = HEADER_SIZE + ijcmd.msg.length;
-    char* tmp = (char*) malloc(tmplen);
-
-    if (tmp)
-    {
-        memcpy(tmp, &ijcmd.msg, HEADER_SIZE);
-        if (ijcmd.msg.length > 0)
-            memcpy(tmp + HEADER_SIZE, ijcmd.data, ijcmd.msg.length);
-
-        if(!ijmsg_send_to_evdi(g_fd[fdtype_device], IJTYPE_PEDOMETER, (const char*) tmp, tmplen)) {
-            LOGERR("msg_send_to_evdi: failed\n");
-        }
-
-        free(tmp);
-    }
-}
-
 void process_evdi_command(ijcommand* ijcmd)
 {
     int fd = -1;
@@ -177,10 +45,6 @@ void process_evdi_command(ijcommand* ijcmd)
     {
         msgproc_sensor(fd, ijcmd);
     }
-    else if (strncmp(ijcmd->cmd, "pedometer", 9) == 0)
-    {
-        msgproc_pedometer(fd, ijcmd);
-    }
     else if (strncmp(ijcmd->cmd, "location", 8) == 0)
     {
         msgproc_location(fd, ijcmd);
@@ -227,10 +91,6 @@ bool server_process(void)
         {
             recv_from_evdi(fd_tmp);
         }
-        else if (fd_tmp == g_fd[fdtype_pedometer])
-        {
-            recv_from_pedometer(fd_tmp);
-        }
         else
         {
                LOGERR("unknown request event fd : (%d)", fd_tmp);
@@ -242,27 +102,8 @@ bool server_process(void)
 
 void init_profile(void)
 {
-    if(pthread_create(&tid[TID_PEDOMETER], NULL, init_pedometer_connect, NULL) != 0)
-    {
-        LOGERR("pthread create fail!");
-        close(g_epoll_fd);
-        exit(0);
-    }
 }
 
 void exit_profile(void)
 {
-       int state;
-    if (!is_pedometer_connected())
-    {
-        int status;
-        pthread_join(tid[TID_PEDOMETER], (void **)&status);
-        LOGINFO("pedometer thread end %d\n", status);
-       }
-
-    state = pthread_mutex_destroy(&mutex_pedometerconnect);
-    if (state != 0)
-    {
-        LOGERR("mutex_pedometerconnect is failed to destroy.");
-    }
 }