X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=para.h;h=a39ed97df45502a0f93dcd8217cf5d9d6e792c78;hp=0cb1538d2725fd79c7de01871bcb617bcd73c706;hb=2b471378b49c04db7bb84d1e75db981f91ad93db;hpb=2bb11d7d5ee7f515287d5ac5ea09d80bc5d6780f;ds=sidebyside diff --git a/para.h b/para.h index 0cb1538d..a39ed97d 100644 --- a/para.h +++ b/para.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2007 Andre Noll + * Copyright (C) 1997-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -118,8 +118,8 @@ } /** version text used by various commands if -V switch was given */ -#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION "\n" \ - "Copyright (C) 2007 Andre Noll\n" \ +#define VERSION_TEXT(prefix) "para_" prefix " " PACKAGE_VERSION " (" CODENAME ")" "\n" \ + "Copyright (C) 2008 Andre Noll\n" \ "This is free software with ABSOLUTELY NO WARRANTY." \ " See COPYING for details.\n" \ "Written by Andre Noll.\n" \ @@ -157,6 +157,9 @@ int tv_convex_combination(const long a, const struct timeval *tv1, const long b, const struct timeval *tv2, struct timeval *result); void ms2tv(const long unsigned n, struct timeval *tv); +void compute_chunk_time(long unsigned chunk_num, + struct timeval *chunk_tv, struct timeval *stream_start, + struct timeval *result); /** The enum of all status items. */ enum status_items {STATUS_ITEM_ENUM NUM_STAT_ITEMS}; @@ -213,7 +216,7 @@ static inline long int para_random(unsigned max) } /** Round up x to a multiple of y */ -#define ROUND_UP(x, y) (((x) + (y - 1) / (y)) * (y)) +#define ROUND_UP(x, y) (((x) + ((y) - 1) / (y)) * (y)) /** Get the size of an array */ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))