git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipc: fix return without mutex unlock
[dpdk.git]
/
lib
/
librte_eal
/
common
/
eal_common_proc.c
diff --git
a/lib/librte_eal/common/eal_common_proc.c
b/lib/librte_eal/common/eal_common_proc.c
index
2179f3d
..
ad02c00
100644
(file)
--- a/
lib/librte_eal/common/eal_common_proc.c
+++ b/
lib/librte_eal/common/eal_common_proc.c
@@
-129,7
+129,7
@@
create_socket_path(const char *name, char *buf, int len)
if (strlen(name) > 0)
snprintf(buf, len, "%s_%s", prefix, name);
else
if (strlen(name) > 0)
snprintf(buf, len, "%s_%s", prefix, name);
else
- s
nprintf(buf, len, "%s", prefix
);
+ s
trlcpy(buf, prefix, len
);
}
int
}
int
@@
-200,7
+200,7
@@
rte_mp_action_register(const char *name, rte_mp_t action)
rte_errno = ENOMEM;
return -1;
}
rte_errno = ENOMEM;
return -1;
}
- str
cpy(entry->action_name, name
);
+ str
lcpy(entry->action_name, name, sizeof(entry->action_name)
);
entry->action = action;
pthread_mutex_lock(&mp_mutex_action);
entry->action = action;
pthread_mutex_lock(&mp_mutex_action);
@@
-323,8
+323,7
@@
process_msg(struct mp_msg_internal *m, struct sockaddr_un *s)
*/
struct rte_mp_msg dummy;
memset(&dummy, 0, sizeof(dummy));
*/
struct rte_mp_msg dummy;
memset(&dummy, 0, sizeof(dummy));
- snprintf(dummy.name, sizeof(dummy.name),
- "%s", msg->name);
+ strlcpy(dummy.name, msg->name, sizeof(dummy.name));
mp_send(&dummy, s->sun_path, MP_IGN);
} else {
RTE_LOG(ERR, EAL, "Cannot find action: %s\n",
mp_send(&dummy, s->sun_path, MP_IGN);
} else {
RTE_LOG(ERR, EAL, "Cannot find action: %s\n",
@@
-526,6
+525,7
@@
async_reply_handle(void *arg __rte_unused)
wait_for_async_messages();
if (gettimeofday(&now, NULL) < 0) {
wait_for_async_messages();
if (gettimeofday(&now, NULL) < 0) {
+ pthread_mutex_unlock(&pending_requests.lock);
RTE_LOG(ERR, EAL, "Cannot get current time\n");
break;
}
RTE_LOG(ERR, EAL, "Cannot get current time\n");
break;
}
@@
-621,11
+621,11
@@
rte_mp_channel_init(void)
/* create filter path */
create_socket_path("*", path, sizeof(path));
/* create filter path */
create_socket_path("*", path, sizeof(path));
- s
nprintf(mp_filter, sizeof(mp_filter), "%s", basename(path
));
+ s
trlcpy(mp_filter, basename(path), sizeof(mp_filter
));
/* path may have been modified, so recreate it */
create_socket_path("*", path, sizeof(path));
/* path may have been modified, so recreate it */
create_socket_path("*", path, sizeof(path));
- s
nprintf(mp_dir_path, sizeof(mp_dir_path), "%s", dirname(
path));
+ s
trlcpy(mp_dir_path, dirname(path), sizeof(mp_dir_
path));
/* lock the directory */
dir_fd = open(mp_dir_path, O_RDONLY);
/* lock the directory */
dir_fd = open(mp_dir_path, O_RDONLY);
@@
-673,11
+673,11
@@
rte_mp_channel_init(void)
}
/* try best to set thread name */
}
/* try best to set thread name */
- s
nprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "rte_mp_handle"
);
+ s
trlcpy(thread_name, "rte_mp_handle", RTE_MAX_THREAD_NAME_LEN
);
rte_thread_setname(mp_handle_tid, thread_name);
/* try best to set thread name */
rte_thread_setname(mp_handle_tid, thread_name);
/* try best to set thread name */
- s
nprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "rte_mp_async_handle"
);
+ s
trlcpy(thread_name, "rte_mp_async_handle", RTE_MAX_THREAD_NAME_LEN
);
rte_thread_setname(async_reply_handle_tid, thread_name);
/* unlock the directory */
rte_thread_setname(async_reply_handle_tid, thread_name);
/* unlock the directory */
@@
-710,7
+710,7
@@
send_msg(const char *dst_path, struct rte_mp_msg *msg, int type)
memset(&dst, 0, sizeof(dst));
dst.sun_family = AF_UNIX;
memset(&dst, 0, sizeof(dst));
dst.sun_family = AF_UNIX;
- s
nprintf(dst.sun_path, sizeof(dst.sun_path), "%s", dst_path
);
+ s
trlcpy(dst.sun_path, dst_path, sizeof(dst.sun_path)
);
memset(&msgh, 0, sizeof(msgh));
memset(control, 0, sizeof(control));
memset(&msgh, 0, sizeof(msgh));
memset(control, 0, sizeof(control));
@@
-870,7
+870,7
@@
mp_request_async(const char *dst, struct rte_mp_msg *req,
memset(reply_msg, 0, sizeof(*reply_msg));
sync_req->type = REQUEST_TYPE_ASYNC;
memset(reply_msg, 0, sizeof(*reply_msg));
sync_req->type = REQUEST_TYPE_ASYNC;
- str
cpy(sync_req->dst, dst
);
+ str
lcpy(sync_req->dst, dst, sizeof(sync_req->dst)
);
sync_req->request = req;
sync_req->reply = reply_msg;
sync_req->async.param = param;
sync_req->request = req;
sync_req->reply = reply_msg;
sync_req->async.param = param;
@@
-916,7
+916,7
@@
mp_request_sync(const char *dst, struct rte_mp_msg *req,
sync_req.type = REQUEST_TYPE_SYNC;
sync_req.reply_received = 0;
sync_req.type = REQUEST_TYPE_SYNC;
sync_req.reply_received = 0;
- str
cpy(sync_req.dst, dst
);
+ str
lcpy(sync_req.dst, dst, sizeof(sync_req.dst)
);
sync_req.request = req;
sync_req.reply = &msg;
pthread_cond_init(&sync_req.sync.cond, NULL);
sync_req.request = req;
sync_req.reply = &msg;
pthread_cond_init(&sync_req.sync.cond, NULL);