github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 02:51:55 +00:00
Code Issues Projects Releases Wiki Activity

transfused: Use Linux coding style (mostly)

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2016-09-02 16:57:52 +01:00
parent 1a289d04e5
commit 3c30271f3c
6 changed files with 1294 additions and 1158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1830
alpine/packages/transfused/transfused.c
View File

File diff suppressed because it is too large Load Diff

66
alpine/packages/transfused/transfused.h
View File

@ -1,37 +1,9 @@
#ifndef _TRANSFUSED_H_
#define _TRANSFUSED_H_
#include <pthread.h>
#include <sys/socket.h>
typedef struct {
char * server;
char * socket;
char * fusermount;
char * pidfile;
char * logfile;
int logfile_fd;
int ctl_sock;
int data_sock;
pthread_mutex_t ctl_lock;
} parameters;
typedef struct {
parameters * params;
char * type_descr;
char * mount_point;
struct sockaddr sa_client;
socklen_t socklen_client;
int sock;
} connection_t;
pthread_attr_t detached;
void * must_malloc(char *const descr, size_t size);
void lock(char *const descr, pthread_mutex_t * mutex);
void unlock(char *const descr, pthread_mutex_t * mutex);
void write_exactly(char * descr, int fd, void * buf, size_t nbyte);
#define IN_BUFSZ ((1 << 20) + 16)
#define OUT_BUFSZ ((1 << 20) + 64)
#define EVENT_BUFSZ 4096
@ -49,7 +21,7 @@ void write_exactly(char * descr, int fd, void * buf, size_t nbyte);
#define TRUNCATE_SYSCALL 4
#define CHMOD_SYSCALL 5
#define MKNOD_REG_SYSCALL 6
// these could be turned into an enum probably but... C standard nausea
/* these could be turned into an enum probably but...C standard nausea */
#define MOUNT_SUITABILITY_REQUEST 1
#define EXPORT_SUITABILITY_REQUEST 2
@ -59,3 +31,33 @@ void write_exactly(char * descr, int fd, void * buf, size_t nbyte);
#define PONG_REPLY 3
#define MOUNT_SUITABILITY_REPLY 4
#define TRANSFUSE_NOTIFY_CHANNEL 5
typedef struct {
char *server;
char *socket;
char *fusermount;
char *pidfile;
char *logfile;
int logfile_fd;
int ctl_sock;
int data_sock;
pthread_mutex_t ctl_lock;
} parameters;
typedef struct {
parameters *params;
char *type_descr;
char *mount_point;
struct sockaddr sa_client;
socklen_t socklen_client;
int sock;
} connection_t;
pthread_attr_t detached;
void *must_malloc(char *const descr, size_t size);
void lock(char *const descr, pthread_mutex_t *mutex);
void unlock(char *const descr, pthread_mutex_t *mutex);
void write_exactly(char *descr, int fd, void *buf, size_t nbyte);
#endif /* _TRANSFUSED_H_ */

375
alpine/packages/transfused/transfused_log.c
View File

@ -15,232 +15,243 @@
#include <inttypes.h>
#include "transfused.h"
#include "transfused_log.h"
void log_timestamp(int fd) {
char timestamp[26];
int msec;
struct tm* tm_info;
struct timeval tv;
gettimeofday(&tv, NULL);
msec = lrint(tv.tv_usec/1000.0);
if (msec >= 1000) {
msec -= 1000;
tv.tv_sec++;
}
tm_info = localtime(&tv.tv_sec);
strftime(timestamp, 26, "%Y-%m-%d %H:%M:%S", tm_info);
dprintf(fd, "%s.%03d ", timestamp, msec);
}
void die
(int exit_code, parameters * params, const char * parg, const char * fmt, ...);
void vlog_sock_locked
(int fd, uint16_t msg_type, const char * fmt, va_list args) {
int rc, len;
va_list targs;
char * fill;
va_copy(targs, args);
len = vsnprintf(NULL, 0, fmt, targs);
if (len < 0) die(1, NULL, NULL, "Couldn't log due to vsnprintf failure");
va_end(targs);
rc = len + 4 + 2; // 4 for length itself and 2 for message type
write_exactly("vlog_sock_locked", fd, (uint32_t *) &rc, sizeof(uint32_t));
write_exactly("vlog_sock_locked", fd, &msg_type, sizeof(uint16_t));
va_copy(targs, args);
rc = vdprintf(fd, fmt, targs);
if (rc < 0) die(1, NULL, "Couldn't send log message with vdprintf", "");
va_end(targs);
if (rc < len) { // we didn't write the whole message :-(
rc = len - rc;
fill = (char *) calloc(rc, 1);
if (fill == NULL) die(1, NULL, "vlog_sock_locked fill", "");
write_exactly("vlog_sock_locked fill", fd, fill, rc);
}
}
void log_sock_locked(int fd, uint16_t msg_type, const char * fmt, ...) {
va_list args;
va_start(args, fmt);
vlog_sock_locked(fd, msg_type, fmt, args);
va_end(args);
}
void die
(int exit_code, parameters * params, const char * parg, const char * fmt, ...)
void log_timestamp(int fd)
{
va_list argp, targs;
int in_errno = errno;
int fd = 0;
char timestamp[26];
int msec;
struct tm *tm_info;
struct timeval tv;
if (params != NULL) {
fd = params->ctl_sock;
lock("die ctl_lock", &params->ctl_lock);
}
gettimeofday(&tv, NULL);
va_start(argp, fmt);
va_copy(targs, argp);
vsyslog(LOG_CRIT, fmt, targs);
va_end(targs);
msec = lrint(tv.tv_usec / 1000.0);
if (msec >= 1000) {
msec -= 1000;
tv.tv_sec++;
}
tm_info = localtime(&tv.tv_sec);
if (fd != 0) vlog_sock_locked(fd, TRANSFUSE_LOG_ERROR, fmt, argp);
va_end(argp);
if (parg != NULL) {
if (*parg != 0) {
syslog(LOG_CRIT, "%s: %s", parg, strerror(in_errno));
if (fd != 0)
log_sock_locked(fd, TRANSFUSE_LOG_ERROR,
"%s: %s", parg, strerror(in_errno));
} else {
syslog(LOG_CRIT, "%s", strerror(in_errno));
if (fd != 0)
log_sock_locked(fd, TRANSFUSE_LOG_ERROR, "%s", strerror(in_errno));
}
}
if (fd != 0) close(fd); // flush
exit(exit_code);
// Nobody else should die before we terminate everything
unlock("die ctl_lock", &params->ctl_lock);
strftime(timestamp, 26, "%Y-%m-%d %H:%M:%S", tm_info);
dprintf(fd, "%s.%03d ", timestamp, msec);
}
void vlog_locked
(parameters * params, uint16_t msg_type, const char * fmt, va_list args) {
int rc;
int fd = params->ctl_sock;
va_list targs;
void vlog_sock_locked(int fd, uint16_t msg_type, const char *fmt, va_list args)
{
int rc, len;
va_list targs;
char *fill;
if (fd != 0) vlog_sock_locked(fd, msg_type, fmt, args);
else {
va_copy(targs, args);
// TODO: translate msg_type to syslog message type
vsyslog(LOG_INFO, fmt, targs);
va_end(targs);
va_copy(targs, args);
len = vsnprintf(NULL, 0, fmt, targs);
if (len < 0)
die(1, NULL, NULL, "Couldn't log due to vsnprintf failure");
va_end(targs);
fd = params->logfile_fd;
if (fd != 0) {
va_copy(targs, args);
// TODO: include message type?
rc = vdprintf(fd, fmt, targs);
if (rc < 0) die(1, NULL, "Couldn't write log message with vdprintf", "");
va_end(targs);
}
}
/* 4 for length itself and 2 for message type */
rc = len + 4 + 2;
write_exactly("vlog_sock_locked", fd,
(uint32_t *)&rc, sizeof(uint32_t));
write_exactly("vlog_sock_locked", fd, &msg_type, sizeof(uint16_t));
va_copy(targs, args);
rc = vdprintf(fd, fmt, targs);
if (rc < 0)
die(1, NULL, "Couldn't send log message with vdprintf", "");
va_end(targs);
if (rc < len) {
/* we didn't write the whole message :-( */
rc = len - rc;
fill = (char *)calloc(rc, 1);
if (fill == NULL)
die(1, NULL, "vlog_sock_locked fill", "");
write_exactly("vlog_sock_locked fill", fd, fill, rc);
}
}
void vlog_time_locked
(parameters * params, uint16_t msg_type, const char * fmt, va_list args) {
int fd = params->logfile_fd;
void log_sock_locked(int fd, uint16_t msg_type, const char *fmt, ...)
{
va_list args;
if (fd != 0 && params->ctl_sock == 0) log_timestamp(fd);
vlog_locked(params, msg_type, fmt, args);
va_start(args, fmt);
vlog_sock_locked(fd, msg_type, fmt, args);
va_end(args);
}
void log_time_locked
(parameters * params, uint16_t msg_type, const char * fmt, ...) {
va_list args;
void die(int exit_code, parameters *params, const char *parg,
const char *fmt, ...)
{
va_list argp, targs;
int in_errno = errno;
int fd = 0;
va_start(args, fmt);
if (params != NULL) {
fd = params->ctl_sock;
lock("die ctl_lock", &params->ctl_lock);
}
vlog_time_locked(params, msg_type, fmt, args);
va_start(argp, fmt);
va_copy(targs, argp);
vsyslog(LOG_CRIT, fmt, targs);
va_end(targs);
va_end(args);
if (fd != 0)
vlog_sock_locked(fd, TRANSFUSE_LOG_ERROR, fmt, argp);
va_end(argp);
if (parg != NULL) {
if (*parg != 0) {
syslog(LOG_CRIT, "%s: %s", parg, strerror(in_errno));
if (fd != 0)
log_sock_locked(fd, TRANSFUSE_LOG_ERROR,
"%s: %s", parg, strerror(in_errno));
} else {
syslog(LOG_CRIT, "%s", strerror(in_errno));
if (fd != 0)
log_sock_locked(fd, TRANSFUSE_LOG_ERROR,
"%s", strerror(in_errno));
}
}
if (fd != 0)
close(fd); /* flush */
exit(exit_code);
/* Nobody else should die before we terminate everything */
unlock("die ctl_lock", &params->ctl_lock);
}
void log_time(parameters * params, const char * fmt, ...) {
va_list args;
void vlog_locked(parameters *params, uint16_t msg_type,
const char *fmt, va_list args)
{
int rc;
int fd = params->ctl_sock;
va_list targs;
va_start(args, fmt);
if (fd != 0) {
vlog_sock_locked(fd, msg_type, fmt, args);
} else {
va_copy(targs, args);
/* TODO: translate msg_type to syslog message type */
vsyslog(LOG_INFO, fmt, targs);
va_end(targs);
lock("log_time ctl_lock", &params->ctl_lock);
vlog_time_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
unlock("log_time ctl_lock", &params->ctl_lock);
va_end(args);
fd = params->logfile_fd;
if (fd != 0) {
va_copy(targs, args);
/* TODO: include message type? */
rc = vdprintf(fd, fmt, targs);
if (rc < 0)
die(1, NULL,
"Couldn't write log message with vdprintf", "");
va_end(targs);
}
}
}
void log_notice_time(parameters * params, const char * fmt, ...) {
va_list args;
void vlog_time_locked(parameters *params, uint16_t msg_type,
const char *fmt, va_list args)
{
int fd = params->logfile_fd;
va_start(args, fmt);
if (fd != 0 && params->ctl_sock == 0)
log_timestamp(fd);
vlog_locked(params, msg_type, fmt, args);
}
lock("log_time ctl_lock", &params->ctl_lock);
vlog_time_locked(params, TRANSFUSE_LOG_NOTICE, fmt, args);
unlock("log_time ctl_lock", &params->ctl_lock);
void log_time_locked(parameters *params, uint16_t msg_type,
const char *fmt, ...)
{
va_list args;
va_end(args);
va_start(args, fmt);
vlog_time_locked(params, msg_type, fmt, args);
va_end(args);
}
void log_time(parameters *params, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
lock("log_time ctl_lock", &params->ctl_lock);
vlog_time_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
unlock("log_time ctl_lock", &params->ctl_lock);
va_end(args);
}
void log_notice_time(parameters *params, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
lock("log_time ctl_lock", &params->ctl_lock);
vlog_time_locked(params, TRANSFUSE_LOG_NOTICE, fmt, args);
unlock("log_time ctl_lock", &params->ctl_lock);
va_end(args);
}
typedef struct {
parameters * params;
char * msg;
parameters *params;
char *msg;
} log_thread_state;
void * log_time_thread(void * log_state_ptr) {
log_thread_state * log_state = log_state_ptr;
void *log_time_thread(void *log_state_ptr)
{
log_thread_state *log_state = log_state_ptr;
log_time(log_state->params, log_state->msg);
log_time(log_state->params, log_state->msg);
free(log_state->msg);
free(log_state);
return NULL;
free(log_state->msg);
free(log_state);
return NULL;
}
void thread_log_time(connection_t * conn, const char * fmt, ...) {
pthread_t logger;
va_list args;
log_thread_state * log_state;
void thread_log_time(connection_t *conn, const char *fmt, ...)
{
log_thread_state *log_state;
pthread_t logger;
va_list args;
log_state = must_malloc("thread_log_time log_state",
sizeof(log_thread_state));
log_state->params = conn->params;
log_state = must_malloc("thread_log_time log_state",
sizeof(log_thread_state));
log_state->params = conn->params;
va_start(args, fmt);
if (vasprintf(&log_state->msg, fmt, args) == -1)
die(1, conn->params, "Couldn't allocate thread_log_time message", "");
va_end(args);
va_start(args, fmt);
if (vasprintf(&log_state->msg, fmt, args) == -1)
die(1, conn->params,
"Couldn't allocate thread_log_time message", "");
va_end(args);
// TODO: We currently spawn a new thread for every message. This is
// far from ideal but fine for now as we anticipate thread-sensitive
// log demand to be low.
if ((errno = pthread_create(&logger, &detached, log_time_thread, log_state)))
die(1, conn->params, "",
"Couldn't create log thread for %s connection %s: ",
conn->type_descr, conn->mount_point);
/* TODO: We currently spawn a new thread for every
* message. This is far from ideal but fine for now as we
* anticipate thread-sensitive log demand to be low. */
errno = pthread_create(&logger, &detached, log_time_thread, log_state);
if (errno)
die(1, conn->params, "",
"Couldn't create log thread for %s connection %s: ",
conn->type_descr, conn->mount_point);
}
void log_continue_locked(parameters * params, const char * fmt, ...) {
va_list args;
void log_continue_locked(parameters *params, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
va_end(args);
va_start(args, fmt);
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
va_end(args);
}
void log_continue(parameters * params, const char * fmt, ...) {
va_list args;
void log_continue(parameters *params, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
va_start(args, fmt);
lock("log_continue ctl_lock", &params->ctl_lock);
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
unlock("log_continue ctl_lock", &params->ctl_lock);
lock("log_continue ctl_lock", &params->ctl_lock);
vlog_locked(params, TRANSFUSE_LOG_ERROR, fmt, args);
unlock("log_continue ctl_lock", &params->ctl_lock);
va_end(args);
va_end(args);
}

35
alpine/packages/transfused/transfused_log.h
View File

@ -1,27 +1,26 @@
#ifndef _TRANSFUSED_LOG_H_
#define _TRANSFUSED_LOG_H_
#include <stdarg.h>
#include <inttypes.h>
#include "transfused.h"
void die
(int exit_code, parameters * params, const char * perror_arg,
const char * fmt, ...);
void die(int exit_code, parameters *params, const char *perror_arg,
const char *fmt, ...);
void vlog_locked
(parameters * params, uint16_t msg_type, const char * fmt, va_list args);
void vlog_locked(parameters *params, uint16_t msg_type,
const char *fmt, va_list args);
void vlog_time_locked(parameters *params, uint16_t msg_type,
const char *fmt, va_list args);
void vlog_time_locked
(parameters * params, uint16_t msg_type, const char * fmt, va_list args);
void log_time_locked(parameters *params, uint16_t msg_type,
const char *fmt, ...);
void log_time_locked
(parameters * params, uint16_t msg_type, const char * fmt, ...);
void log_time(parameters *params, const char *fmt, ...);
void log_notice_time(parameters *params, const char *fmt, ...);
void thread_log_time(connection_t *conn, const char *fmt, ...);
void log_continue_locked(parameters *params, const char *fmt, ...);
void log_continue(parameters *params, const char *fmt, ...);
void log_time(parameters * params, const char * fmt, ...);
void log_notice_time(parameters * params, const char * fmt, ...);
void thread_log_time(connection_t * conn, const char * fmt, ...);
void log_continue_locked(parameters * params, const char * fmt, ...);
void log_continue(parameters * params, const char * fmt, ...);
#endif /* _TRANSFUSED_LOG_H_ */

137
alpine/packages/transfused/transfused_vsock.c
View File

@ -7,93 +7,100 @@
#include "transfused_log.h"
long parse_cid(const char * address) {
char * end = NULL;
long cid = strtol(address, &end, 10);
if (address == end || *end != ':') {
*end = 0;
die(2, NULL, NULL, "Invalid vsock cid: %s", address);
}
return cid;
long parse_cid(const char *address)
{
char *end = NULL;
long cid = strtol(address, &end, 10);
if (address == end || *end != ':') {
*end = 0;
die(2, NULL, NULL, "Invalid vsock cid: %s", address);
}
return cid;
}
long parse_port(const char * port_str) {
char * end = NULL;
long port = strtol(port_str, &end, 10);
if (port_str == end || *end != '\0') {
*end = 0;
die(2, NULL, NULL, "Invalid vsock port: %s", port_str);
}
return port;
long parse_port(const char *port_str)
{
char *end = NULL;
long port = strtol(port_str, &end, 10);
if (port_str == end || *end != '\0') {
*end = 0;
die(2, NULL, NULL, "Invalid vsock port: %s", port_str);
}
return port;
}
int find_colon(const char * address) {
int colon = 0;
int find_colon(const char *address)
{
int colon = 0;
while (address[colon] != '\0')
if (address[colon] == ':') break;
else colon++;
while (address[colon] != '\0')
if (address[colon] == ':')
break;
else
colon++;
if (address[colon] == '\0')
die(2, NULL, NULL, "Missing port in vsock address %s", address);
if (address[colon] == '\0')
die(2, NULL, NULL, "Missing port in vsock address %s", address);
return colon;
return colon;
}
int bind_vsock(const char * address) {
long cid, port;
int colon;
int bind_vsock(const char *address)
{
long cid, port;
int colon;
struct sockaddr_vm sa_listen = {
.svm_family = AF_VSOCK,
};
int sock_fd;
struct sockaddr_vm sa_listen = {
.svm_family = AF_VSOCK,
};
colon = find_colon(address);
int sock_fd;
if (address[0] == '_' && colon == 1)
cid = VMADDR_CID_ANY;
else
cid = parse_cid(address);
colon = find_colon(address);
port = parse_port(address + colon + 1);
if (address[0] == '_' && colon == 1) cid = VMADDR_CID_ANY;
else cid = parse_cid(address);
sa_listen.svm_cid = cid;
sa_listen.svm_port = port;
port = parse_port(address + colon + 1);
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
if (sock_fd < 0)
die(1, NULL, "socket(AF_VSOCK)", "");
sa_listen.svm_cid = cid;
sa_listen.svm_port = port;
if (bind(sock_fd, (struct sockaddr *)&sa_listen, sizeof(sa_listen)))
die(1, NULL, "bind(AF_VSOCK)", "");
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
if (sock_fd < 0)
die(1, NULL, "socket(AF_VSOCK)", "");
if (bind(sock_fd, (struct sockaddr *) &sa_listen, sizeof(sa_listen)))
die(1, NULL, "bind(AF_VSOCK)", "");
return sock_fd;
return sock_fd;
}
int connect_vsock(const char * address) {
long cid, port;
int colon;
int connect_vsock(const char *address)
{
long cid, port;
int colon;
struct sockaddr_vm sa_connect = {
.svm_family = AF_VSOCK,
};
int sock_fd;
struct sockaddr_vm sa_connect = {
.svm_family = AF_VSOCK,
};
colon = find_colon(address);
int sock_fd;
cid = parse_cid(address);
port = parse_port(address + colon + 1);
colon = find_colon(address);
sa_connect.svm_cid = cid;
sa_connect.svm_port = port;
cid = parse_cid(address);
port = parse_port(address + colon + 1);
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
if (sock_fd < 0)
die(1, NULL, "socket(AF_VSOCK)", "");
sa_connect.svm_cid = cid;
sa_connect.svm_port = port;
if (connect(sock_fd, (struct sockaddr *)&sa_connect, sizeof(sa_connect)))
die(1, NULL, "connect(AF_VSOCK)", "");
sock_fd = socket(AF_VSOCK, SOCK_STREAM, 0);
if (sock_fd < 0)
die(1, NULL, "socket(AF_VSOCK)", "");
if (connect(sock_fd, (struct sockaddr *) &sa_connect, sizeof(sa_connect)))
die(1, NULL, "connect(AF_VSOCK)", "");
return sock_fd;
return sock_fd;
}

9
alpine/packages/transfused/transfused_vsock.h
View File

@ -1,2 +1,7 @@
int bind_vsock(const char * address);
int connect_vsock(const char * address);
#ifndef _TRANSFUSED_VSOCK_H_
#define _TRANSFUSED_VSOCK_H_
int bind_vsock(const char *address);
int connect_vsock(const char *address);
#endif /* _TRANSFUSED_VSOCK_H_ */