X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=72eb53a328e8018e55426d65a0e88fcdb80e9d95;hp=cbc05d131b28550d8596cee1bb505a835ef81779;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3

diff --git a/vss.c b/vss.c
index cbc05d13..72eb53a3 100644
--- a/vss.c
+++ b/vss.c
@@ -19,6 +19,7 @@
 #include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -611,7 +612,7 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 		for (; i < k; i++)
 			fc->src_data[i] = (const unsigned char *)buf;
 	}
-	PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), %d bytes\n",
+	PARA_DEBUG_LOG("FEC group %u: %u chunks (%u - %u), %u bytes\n",
 		g->num, g->num_chunks, g->first_chunk,
 		g->first_chunk + g->num_chunks - 1, g->bytes
 	);
@@ -905,7 +906,7 @@ static void vss_pre_select(struct sched *s, void *context)
 
 static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)
 {
-	char control[255], buf[8];
+	char control[255] __a_aligned(8), buf[8];
 	struct msghdr msg = {.msg_iov = NULL};
 	struct cmsghdr *cmsg;
 	struct iovec iov;
@@ -1027,7 +1028,7 @@ static void vss_send(struct vss_task *vsst)
 		}
 		if (compute_next_fec_slice(fc, vsst) <= 0)
 			continue;
-		PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
+		PARA_DEBUG_LOG("sending %u:%u (%u bytes)\n", fc->group.num,
 			fc->current_slice_num, fc->group.slice_bytes);
 		fc->fcp->send_fec(fc->sc, (char *)fc->enc_buf,
 			fc->group.slice_bytes + FEC_HEADER_SIZE);
@@ -1187,7 +1188,7 @@ void init_vss_task(int afs_socket, struct sched *s)
 		mmd->vss_status_flags |= VSS_PLAYING;
 		mmd->new_vss_status_flags |= VSS_PLAYING;
 		ms2tv(autoplay_delay, &tmp);
-		tv_add(now, &tmp, &vsst->autoplay_barrier);
+		tv_add(clock_get_realtime(NULL), &tmp, &vsst->autoplay_barrier);
 		tv_add(&vsst->autoplay_barrier, &vsst->announce_tv,
 			&vsst->data_send_barrier);
 	}