Closes #78 - Rename tapasco_api.h/hpp to tapasco.h/hpp

* suffix `_api` is unusual, removed
* fixed all include occurrences

arch/baseline/src/tapasco_init.c

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include <tapasco_errors.h>
 #include <tapasco_jobs.h>
 #include <tapasco_functions.h>

arch/common/doc/doxygen-header.conf

@@ -754,7 +754,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = README.md ../include/tapasco_api.h ../include/tapasco_api.hpp
+INPUT                  = README.md ../include/tapasco.h ../include/tapasco.hpp
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

arch/common/include/tapasco_api.h → arch/common/include/tapasco.h

@@ -16,13 +16,13 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tapasco.  If not, see <http://www.gnu.org/licenses/>.
 //
-//! @file 	tapasco_api.h
+//! @file 	tapasco.h
 //! @brief	Tapasco API for hardware threadpool integration.
 //!		Low-level API to interface hardware accelerators programmed with
 //!		Tapasco support.
 //! @authors 	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //! @authors 	D. de la Chevallerie, TU Darmstadt (dc@esa.cs.tu-darmstadt.de)
-//! @version 	1.2
+//! @version 	1.2.1
 //! @copyright  Copyright 2014, 2015 J. Korinth, TU Darmstadt
 //!
 //!		This file is part of Tapasco (TPC).
@@ -42,6 +42,8 @@
 //!		License along with Tapasco.  If not, see
 //!		<http://www.gnu.org/licenses/>.
 //! @details	### Change Log ###
+//!		- Version 1.2.1 (jk)
+//!		  + renamed to 'tapasco.h'
 //!		- Version 1.2 (jk)
 //!		  + removed 'rpr' namespace
 //!		- Version 1.1 (jk)
@@ -54,8 +56,8 @@
 //!
 //! @todo 	device enumeration?
 //!
-#ifndef __TAPASCO_API_H__
-#define __TAPASCO_API_H__
+#ifndef TAPASCO_API_H__
+#define TAPASCO_API_H__
 
 #ifdef __cplusplus
 #include <cstdint>
@@ -157,7 +159,7 @@ typedef enum {
  *  @{
  **/
 
-#define TAPASCO_API_VERSION					"1.2"
+#define TAPASCO_API_VERSION					"1.2.1"
 
 /**
  * Returns the version string of the library.
@@ -409,5 +411,5 @@ tapasco_res_t tapasco_device_job_get_return(tapasco_dev_ctx_t *dev_ctx,
 } /* extern "C" */ } /* namespace tapasco */
 #endif /* __cplusplus */
 
-#endif /* __TAPASCO_API_H__ */
+#endif /* TAPASCO_API_H__ */
 /* vim: set foldmarker=@{,@} foldlevel=0 foldmethod=marker : */

arch/common/include/tapasco_api.hpp → arch/common/include/tapasco.hpp

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tapasco.  If not, see <http://www.gnu.org/licenses/>.
 //
-//! @file 	tapasco_api.hpp
+//! @file 	tapasco.hpp
 //! @brief	Primitive C++ wrapper class for TPC API: Simplifies calls to
 //!		FPG and handling of device memory, jobs, etc.
 //! @authors 	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
@@ -40,6 +40,8 @@
 //!		License along with Tapasco.  If not, see
 //!		<http://www.gnu.org/licenses/>.
 //! @details	### Change Log ###
+//!		- 03/2016 Version 1.2.1 (jk)
+//!		  + renamed to 'tapasco.hpp'
 //!		- 03/2016 Version 1.2 (jk)
 //!		  + added compiler check: header requires g++ >= 5.x.x
 //!		- 02/2016 Version 1.2 (jk)
@@ -61,8 +63,8 @@
 //!		- 08/2015 Version 1.0 (jk) 
 //!		  + initial prototype version
 //!
-#ifndef __TAPASCO_API_HPP__
-#define __TAPASCO_API_HPP__
+#ifndef TAPASCO_API_HPP__
+#define TAPASCO_API_HPP__
 
 #ifndef __clang__
 #if __GNUC__ && __GNUC__< 5
@@ -70,7 +72,7 @@
 #endif
 #endif
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include <type_traits>
 #include <stdexcept>
 #include <future>
@@ -103,7 +105,7 @@ struct OutOnly final {
 };
 
 /**
- * C++ Wrapper class for TPC API. Currently wraps a single device.
+ * C++ Wrapper class for TaPaSCo API. Currently wraps a single device.
  **/
 struct Tapasco {
   /**
@@ -468,4 +470,4 @@ private:
 
 } /* namespace tapasco */
 
-#endif /* __TAPASCO_API_HPP__ */
+#endif /* TAPASCO_API_HPP__ */

arch/common/include/tapasco_address_map.h

@@ -22,10 +22,10 @@
 //!		addresses. Supporting file for re-use.
 //! @authors	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_ADDRESS_MAP_H__
-#define __TAPASCO_ADDRESS_MAP_H__
+#ifndef TAPASCO_ADDRESS_MAP_H__
+#define TAPASCO_ADDRESS_MAP_H__
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 
 /** Register space address type (opaque). */
 typedef uint32_t tapasco_reg_addr_t;
@@ -64,6 +64,4 @@ tapasco_reg_addr_t tapasco_address_map_func_arg_register(tapasco_dev_ctx_t *dev_
 tapasco_reg_addr_t tapasco_address_map_func_reg(tapasco_dev_ctx_t *dev_ctx,
 		uint32_t const slot_id, tapasco_func_reg_t const reg);
 
-#endif /* __TAPASCO_ADDRESS_MAP_H__ */
-
-
+#endif /* TAPASCO_ADDRESS_MAP_H__ */

arch/common/include/tapasco_device.h

@@ -20,13 +20,12 @@
 //! @brief	Device context struct and helper methods.
 //! @authors	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //! 
-#ifndef __TAPASCO_DEVICE_H__
-#define __TAPASCO_DEVICE_H__
+#ifndef TAPASCO_DEVICE_H__
+#define TAPASCO_DEVICE_H__
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include <tapasco_functions.h>
 
 tapasco_functions_t *tapasco_device_functions(tapasco_dev_ctx_t *dev_ctx);
 
-#endif /* __TAPASCO_DEVICE_H__ */
-
+#endif /* TAPASCO_DEVICE_H__ */

arch/common/include/tapasco_errors.h

@@ -20,10 +20,10 @@
 //! @brief	Error messages and codes.
 //! @authors	J. Korinth (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_API_ERROR_H__
-#define __TAPASCO_API_ERROR_H__
+#ifndef TAPASCO_API_ERROR_H__
+#define TAPASCO_API_ERROR_H__
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 
 #ifdef __cplusplus
 namespace rpr { namespace tapasco { extern "C" {
@@ -62,4 +62,4 @@ typedef enum {
 } /* extern "C" */ } /* namespace tapasco */ } /* namespace rpr */
 #endif /* __cplusplus */
 
-#endif /* __TAPASCO_API_ERROR_H__ */
+#endif /* TAPASCO_API_ERROR_H__ */

arch/common/include/tapasco_functions.h

@@ -21,10 +21,10 @@
 //!             hardware threadpool, perform enumeration, locking etc.
 //! @authors	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_FUNCTIONS_H__
-#define __TAPASCO_FUNCTIONS_H__
+#ifndef TAPASCO_FUNCTIONS_H__
+#define TAPASCO_FUNCTIONS_H__
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 
 #define TAPASCO_MAX_INSTANCES					128
 
@@ -83,5 +83,4 @@ void tapasco_functions_release(tapasco_functions_t *ctx, tapasco_func_slot_id_t
  **/
 uint32_t tapasco_functions_count(tapasco_functions_t const *ctx, tapasco_func_id_t const f_id);
 
-#endif /* __TAPASCO_FUNCTIONS_H__ */
-
+#endif /* TAPASCO_FUNCTIONS_H__ */

arch/common/include/tapasco_jobs.h

@@ -20,8 +20,8 @@
 //! @brief	Defines a micro API for threadpool job management.
 //! @author	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_API_JOBS_H__
-#define __TAPASCO_API_JOBS_H__
+#ifndef TAPASCO_API_JOBS_H__
+#define TAPASCO_API_JOBS_H__
 
 #ifdef __cplusplus
 	#include <cstdint>
@@ -35,11 +35,11 @@
 	#include <assert.h>
 #endif
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include "tapasco_errors.h"
 
 #define TAPASCO_JOBS_Q_SZ						250
-#define	TAPASCO_JOB_MAX_ARGS					32
+#define	TAPASCO_JOB_MAX_ARGS						32
 
 #ifdef __cplusplus
 namespace rpr { namespace tapasco { extern "C" {
@@ -216,6 +216,4 @@ void tapasco_jobs_release(tapasco_jobs_t *jobs, tapasco_job_id_t const j_id);
 } /* extern "C" */ } /* namespace tapasco */ } /* namespace rpr */
 #endif
 
-#endif /* __TAPASCO_API_JOBS_H__ */
-
-
+#endif /* TAPASCO_API_JOBS_H__ */

arch/common/include/tapasco_logging.h

@@ -24,8 +24,8 @@
 //!		are always activated.
 //! @authors	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_LOGGING_H__
-#define __TAPASCO_LOGGING_H__
+#ifndef TAPASCO_LOGGING_H__
+#define TAPASCO_LOGGING_H__
 
 #define LIBTAPASCO_LOGLEVELS \
 	_LALL(INIT,		(1 << 1)) \
@@ -54,4 +54,4 @@ void tapasco_log(tapasco_ll_t const level, char *fmt, ...);
 #define WRN(msg, ...)		tapasco_log(1, "[%s] " msg "\n", __func__, ##__VA_ARGS__)
 #define LOG(l, msg, ...)	tapasco_log(l, "[%s] " msg "\n", __func__, ##__VA_ARGS__)
 
-#endif /* __TAPASCO_LOGGING_H__ */
+#endif /* TAPASCO_LOGGING_H__ */

arch/common/include/tapasco_scheduler.h

@@ -20,10 +20,10 @@
 //! @brief	Defines micro API for job scheduling on hardware threadpools.
 //! @author	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_SCHEDULER_H__
-#define __TAPASCO_SCHEDULER_H__
+#ifndef TAPASCO_SCHEDULER_H__
+#define TAPASCO_SCHEDULER_H__
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include <tapasco_jobs.h>
 #include <tapasco_functions.h>
 
@@ -41,5 +41,5 @@ tapasco_res_t tapasco_scheduler_launch(
 		tapasco_functions_t *functions,
 		tapasco_job_id_t const j_id);
 
-#endif /* __TAPASCO_SCHEDULER_H__ */
+#endif /* TAPASCO_SCHEDULER_H__ */
 

arch/common/include/tapasco_status.h

@@ -21,10 +21,10 @@
  *  @brief	
  *  @author	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
  **/
-#ifndef __TAPASCO_STATUS_H__
-#define __TAPASCO_STATUS_H__
+#ifndef TAPASCO_STATUS_H__
+#define TAPASCO_STATUS_H__
 
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include <tapasco_functions.h>
 
 typedef struct tapasco_status tapasco_status_t;
@@ -35,4 +35,4 @@ struct tapasco_status {
 tapasco_res_t tapasco_status_init(tapasco_status_t **status);
 void tapasco_status_deinit(tapasco_status_t *status);
 
-#endif /* __TAPASCO_STATUS_H__ */
+#endif /* TAPASCO_STATUS_H__ */

arch/common/src/tapasco_version.c

@@ -22,7 +22,7 @@
  *  @author	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
  **/
 #include <string.h>
-#include <tapasco_api.h>
+#include <tapasco.h>
 #include <tapasco_errors.h>
 
 const char *const tapasco_version()

arch/common/tests/tapasco-logging-benchmark/tapasco_logging_benchmark.c

@@ -32,7 +32,7 @@
 #include <pthread.h>
 #include <sys/time.h>
 
-#include "tapasco_api.h"
+#include "tapasco.h"
 #include "tapasco_logging_benchmark.h"
 #include "tapasco_logging.h"
 

arch/common/tests/tapasco-logging-benchmark/tapasco_logging_benchmark.h

@@ -24,8 +24,8 @@
  *  		Random data is preallocated in memory block to avoid L2 effects.
  *  @author	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
  **/
-#ifndef __TAPASCO_LOGGING_TEST_H__
-#define __TAPASCO_LOGGING_TEST_H__
+#ifndef TAPASCO_LOGGING_TEST_H__
+#define TAPASCO_LOGGING_TEST_H__
 #include <unistd.h>
 
 // should exceed size of L2 cache to prevent caching effects
@@ -33,5 +33,4 @@
 #define DEFAULT_LOGS					10000000
 #define DEFAULT_THREADS					(sysconf(_SC_NPROCESSORS_CONF))
 
-#endif /* __TAPASCO_LOGGING_TEST_H__ */
-
+#endif /* TAPASCO_LOGGING_TEST_H__ */

arch/common/tests/tapasco_functions_test.h

@@ -20,11 +20,11 @@
 //! @brief	Unit tests for functions micro API implementation.
 //! @authors	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_COMMON_FUNCTIONS_TEST_H__
-#define __TAPASCO_COMMON_FUNCTIONS_TEST_H__
+#ifndef TAPASCO_COMMON_FUNCTIONS_TEST_H__
+#define TAPASCO_COMMON_FUNCTIONS_TEST_H__
 
 #include <check.h>
 
 TCase *functions_testcase(void);
 
-#endif /* __TAPASCO_COMMON_FUNCTIONS_TEST_H__ */
+#endif /* TAPASCO_COMMON_FUNCTIONS_TEST_H__ */

arch/common/tests/tapasco_jobs_test.h

@@ -20,11 +20,11 @@
 //! @brief	Unit tests for jobs micro API implementations.
 //! @authors 	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
 //!
-#ifndef __TAPASCO_COMMON_JOBS_TEST_H__
-#define __TAPASCO_COMMON_JOBS_TEST_H__
+#ifndef TAPASCO_COMMON_JOBS_TEST_H__
+#define TAPASCO_COMMON_JOBS_TEST_H__
 
 #include <check.h>
 
 TCase *jobs_testcase(void);
 
-#endif /* __TAPASCO_COMMON_JOBS_TEST_H__ */
+#endif /* TAPASCO_COMMON_JOBS_TEST_H__ */

arch/tests/InterruptLatency.hpp

@@ -20,7 +20,7 @@
 #include <cmath>
 #include <unistd.h>
 #include <ncurses.h>
-#include <tapasco_api.hpp>
+#include <tapasco.hpp>
 
 using namespace std;
 using namespace std::chrono;

arch/tests/JobThroughput.hpp

@@ -14,7 +14,7 @@
 #include <future>
 #include <vector>
 #include <ncurses.h>
-#include <tapasco_api.hpp>
+#include <tapasco.hpp>
 
 using namespace std;
 using namespace std::chrono;

arch/tests/TransferSpeed.hpp

@@ -3,8 +3,8 @@
  *  @brief	Measures the transfer speed via TPC for a given chunk size.
  *  @author	J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de)
  **/
-#ifndef __TRANSFER_SPEED_HPP__
-#define __TRANSFER_SPEED_HPP__
+#ifndef TRANSFER_SPEED_HPP__
+#define TRANSFER_SPEED_HPP__
 
 #include <atomic>
 #include <thread>
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <unistd.h>
 #include <ncurses.h>
-#include <tapasco_api.hpp>
+#include <tapasco.hpp>
 
 using namespace std;
 using namespace std::chrono;
@@ -98,5 +98,5 @@ private:
   Tapasco& tapasco;
 };
 
-#endif /* __TRANSFER_SPEED_HPP__ */
+#endif /* TRANSFER_SPEED_HPP__ */
 /* vim: set foldmarker=@{,@} foldlevel=0 foldmethod=marker : */