projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimize the code that copies strings
[fio.git]
/
engines
/
net.c
diff --git
a/engines/net.c
b/engines/net.c
index 4540e0e4d7c7eea9b9001f16cafb756225f3661a..91f25774690a16ec9e20576ebb95e3e4e2e9f82e 100644
(file)
--- a/
engines/net.c
+++ b/
engines/net.c
@@
-642,8
+642,9
@@
static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
return ret;
}
return ret;
}
-static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
- enum fio_ddir ddir)
+static enum fio_q_status __fio_netio_queue(struct thread_data *td,
+ struct io_u *io_u,
+ enum fio_ddir ddir)
{
struct netio_data *nd = td->io_ops_data;
struct netio_options *o = td->eo;
{
struct netio_data *nd = td->io_ops_data;
struct netio_options *o = td->eo;
@@
-687,7
+688,8
@@
static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
return FIO_Q_COMPLETED;
}
return FIO_Q_COMPLETED;
}
-static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_netio_queue(struct thread_data *td,
+ struct io_u *io_u)
{
struct netio_options *o = td->eo;
int ret;
{
struct netio_options *o = td->eo;
int ret;
@@
-1103,8
+1105,7
@@
static int fio_netio_setup_connect_unix(struct thread_data *td,
struct sockaddr_un *soun = &nd->addr_un;
soun->sun_family = AF_UNIX;
struct sockaddr_un *soun = &nd->addr_un;
soun->sun_family = AF_UNIX;
- memset(soun->sun_path, 0, sizeof(soun->sun_path));
- strncpy(soun->sun_path, path, sizeof(soun->sun_path) - 1);
+ snprintf(soun->sun_path, sizeof(soun->sun_path), "%s", path);
return 0;
}
return 0;
}
@@
-1133,9
+1134,8
@@
static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
mode = umask(000);
mode = umask(000);
- memset(addr, 0, sizeof(*addr));
addr->sun_family = AF_UNIX;
addr->sun_family = AF_UNIX;
- s
trncpy(addr->sun_path, path, sizeof(addr->sun_path) - 1
);
+ s
nprintf(addr->sun_path, sizeof(addr->sun_path), "%s", path
);
unlink(path);
len = sizeof(addr->sun_family) + strlen(path) + 1;
unlink(path);
len = sizeof(addr->sun_family) + strlen(path) + 1;