From 14bb178315820660a53b0159c74cdacf81415a48 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 23 Apr 2014 11:27:04 -0400 Subject: Rename future-impl.h to future-internal.h. --- libdimension/Makefile.am | 4 +-- libdimension/dimension-internal.h | 2 +- libdimension/future-impl.h | 53 --------------------------------------- libdimension/future-internal.h | 53 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 libdimension/future-impl.h create mode 100644 libdimension/future-internal.h diff --git a/libdimension/Makefile.am b/libdimension/Makefile.am index a5a7951..3e3cb86 100644 --- a/libdimension/Makefile.am +++ b/libdimension/Makefile.am @@ -1,5 +1,5 @@ ########################################################################### -## Copyright (C) 2009-2012 Tavian Barnes ## +## Copyright (C) 2009-2014 Tavian Barnes ## ## ## ## This file is part of The Dimension Build Suite. ## ## ## @@ -79,7 +79,7 @@ libdimension_la_SOURCES = $(nobase_include_HEADERS) \ error.c \ finish.c \ future.c \ - future-impl.h \ + future-internal.h \ geometry.c \ gradient.c \ inline.c \ diff --git a/libdimension/dimension-internal.h b/libdimension/dimension-internal.h index 99345c0..c8d728e 100644 --- a/libdimension/dimension-internal.h +++ b/libdimension/dimension-internal.h @@ -32,7 +32,7 @@ #include "compiler-internal.h" #include "profile.h" #include "platform.h" -#include "future-impl.h" +#include "future-internal.h" #include "threads.h" #include "bvh.h" #include "prtree.h" diff --git a/libdimension/future-impl.h b/libdimension/future-impl.h deleted file mode 100644 index 4ec6f75..0000000 --- a/libdimension/future-impl.h +++ /dev/null @@ -1,53 +0,0 @@ -/************************************************************************* - * Copyright (C) 2010-2013 Tavian Barnes * - * * - * This file is part of The Dimension Library. * - * * - * The Dimension Library is free software; you can redistribute it and/ * - * or modify it under the terms of the GNU Lesser General Public License * - * as published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension Library is distributed in the hope that it will be * - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program. If not, see * - * . * - *************************************************************************/ - -/** - * @file - * Future object implementation. - */ - -#include - -/** Allocate a new future object. */ -DMNSN_INTERNAL dmnsn_future *dmnsn_new_future(void); - -/** Set the total number of loop iterations. */ -DMNSN_INTERNAL void dmnsn_future_set_total(dmnsn_future *future, size_t total); -/** Increment the progress of a background task. */ -DMNSN_INTERNAL void dmnsn_future_increment(dmnsn_future *future); -/** Instantly complete the background teask. */ -DMNSN_INTERNAL void dmnsn_future_done(dmnsn_future *future); - -struct dmnsn_future { - size_t progress; /**< Completed loop iterations. */ - size_t total; /**< Total expected loop iterations. */ - - /** The worker thread. */ - pthread_t thread; - - /** Mutex to guard progress and total. */ - pthread_mutex_t mutex; - - /** Condition variable for waiting for a particular amount of progress. */ - pthread_cond_t cond; - - /** Minimum waited-on value. */ - double min_wait; -}; diff --git a/libdimension/future-internal.h b/libdimension/future-internal.h new file mode 100644 index 0000000..4ec6f75 --- /dev/null +++ b/libdimension/future-internal.h @@ -0,0 +1,53 @@ +/************************************************************************* + * Copyright (C) 2010-2013 Tavian Barnes * + * * + * This file is part of The Dimension Library. * + * * + * The Dimension Library is free software; you can redistribute it and/ * + * or modify it under the terms of the GNU Lesser General Public License * + * as published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + * The Dimension Library is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this program. If not, see * + * . * + *************************************************************************/ + +/** + * @file + * Future object implementation. + */ + +#include + +/** Allocate a new future object. */ +DMNSN_INTERNAL dmnsn_future *dmnsn_new_future(void); + +/** Set the total number of loop iterations. */ +DMNSN_INTERNAL void dmnsn_future_set_total(dmnsn_future *future, size_t total); +/** Increment the progress of a background task. */ +DMNSN_INTERNAL void dmnsn_future_increment(dmnsn_future *future); +/** Instantly complete the background teask. */ +DMNSN_INTERNAL void dmnsn_future_done(dmnsn_future *future); + +struct dmnsn_future { + size_t progress; /**< Completed loop iterations. */ + size_t total; /**< Total expected loop iterations. */ + + /** The worker thread. */ + pthread_t thread; + + /** Mutex to guard progress and total. */ + pthread_mutex_t mutex; + + /** Condition variable for waiting for a particular amount of progress. */ + pthread_cond_t cond; + + /** Minimum waited-on value. */ + double min_wait; +}; -- cgit v1.2.3