dany/rmtfs
1
0
Fork 0
mirror of https://github.com/linux-msm/rmtfs.git synced 2026-01-18 09:40:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

rmtfs: Rework message pump

Browse Source 
The message pump is cleaned up from cruft that was added to deal with
multiple services (rmtfs and rfsa) as well as ENETRESET handling.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson
2018-02-01 02:28:17 +00:00
parent db86a3b1a5
commit 42ed7b4e4c
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
rmtfs.c
View File

@@ -406,12 +406,45 @@ static int handle_rmtfs(int sock)
return ret;
}
static int run_rmtfs(void)
{
int rmtfs_fd;
int ret;
rmtfs_fd = qrtr_open(RMTFS_QMI_SERVICE);
if (rmtfs_fd < 0) {
fprintf(stderr, "failed to create qrtr socket\n");
return rmtfs_fd;
}
dbgprintf("registering services\n");
ret = qrtr_publish(rmtfs_fd, RMTFS_QMI_SERVICE,
RMTFS_QMI_VERSION, RMTFS_QMI_INSTANCE);
if (ret < 0) {
fprintf(stderr, "failed to publish rmtfs service");
return ret;
}
for (;;) {
ret = qrtr_poll(rmtfs_fd, -1);
if (ret < 0 && errno != EINTR)
break;
else if (ret < 0 && errno == EINTR)
continue;
ret = handle_rmtfs(rmtfs_fd);
if (ret == -ENETRESET)
break;
}
close(rmtfs_fd);
return ret;
}
int main(int argc, char **argv)
{
bool do_register = true;
int rmtfs_fd;
fd_set rfds;
int nfds;
int ret;
if (argc == 2 && strcmp(argv[1], "-v") == 0)
@@ -427,46 +460,17 @@ int main(int argc, char **argv)
goto close_rmtfs_mem;
}
rmtfs_fd = qrtr_open(RMTFS_QMI_SERVICE);
if (rmtfs_fd < 0) {
fprintf(stderr, "failed to create qrtr socket\n");
goto close_storage;
}
for (;;) {
if (do_register) {
dbgprintf("registering services\n");
ret = run_rmtfs();
ret = qrtr_publish(rmtfs_fd, RMTFS_QMI_SERVICE, RMTFS_QMI_VERSION, RMTFS_QMI_INSTANCE);
if (ret < 0) {
fprintf(stderr, "failed to publish rmtfs service");
break;
}
do_register = false;
}
FD_ZERO(&rfds);
FD_SET(rmtfs_fd, &rfds);
nfds = rmtfs_fd + 1;
ret = select(nfds, &rfds, NULL, NULL, NULL);
if (ret < 0) {
fprintf(stderr, "select failed: %d\n", ret);
if (ret <= 0 && ret != -ENETRESET)
break;
} else if (ret == 0) {
continue;
}
if (FD_ISSET(rmtfs_fd, &rfds))
ret = handle_rmtfs(rmtfs_fd);
if (ret == -ENETRESET)
do_register = true;
}
qrtr_bye(rmtfs_fd, RMTFS_QMI_SERVICE, RMTFS_QMI_VERSION, RMTFS_QMI_INSTANCE);
close_storage:
do {
ret = run_rmtfs();
} while (ret == -ENETRESET);
storage_close();
close_rmtfs_mem:
rmtfs_mem_close(rmem);