diff --git a/opal/mca/timer/aix/Makefile.am b/opal/mca/timer/aix/Makefile.am deleted file mode 100644 index 3b83f72a4e9..00000000000 --- a/opal/mca/timer/aix/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -noinst_LTLIBRARIES = libmca_timer_aix.la - -libmca_timer_aix_la_SOURCES = \ - timer_aix.h \ - timer_aix_component.c -libmca_timer_aix_la_LIBADD = $(timer_aix_LIBS) diff --git a/opal/mca/timer/aix/configure.m4 b/opal/mca/timer/aix/configure.m4 deleted file mode 100644 index 92a378392a4..00000000000 --- a/opal/mca/timer/aix/configure.m4 +++ /dev/null @@ -1,80 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2015 Research Organization for Information Science -# and Technology (RIST). All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -AC_DEFUN([MCA_opal_timer_aix_PRIORITY], [30]) - -AC_DEFUN([MCA_opal_timer_aix_COMPILE_MODE], [ - AC_MSG_CHECKING([for MCA component $2:$3 compile mode]) - $4="static" - AC_MSG_RESULT([$$4]) -]) - -AC_DEFUN([MCA_opal_timer_aix_POST_CONFIG],[ - AS_IF([test "$1" = "1"], [timer_base_include="aix/timer_aix.h"]) -])dnl - - -# MCA_timer_aix_CONFIG(action-if-can-compile, -# [action-if-cant-compile]) -# ------------------------------------------------ -AC_DEFUN([MCA_opal_timer_aix_CONFIG],[ - AC_CONFIG_FILES([opal/mca/timer/aix/Makefile]) - - AS_IF([test "$with_timer" = "aix"], - [timer_aix_happy="yes" - timer_aix_should_use=1], - [timer_aix_should_use=0 - AS_IF([test "$with_timer" = ""], - [timer_aix_happy="yes"], - [timer_aix_happy="no"])]) - - AS_IF([test "$timer_aix_happy" = "yes"], - [AC_CHECK_FUNC([time_base_to_time], - [timer_aix_happy="yes"], - [timer_aix_happy="no"])]) - - # look to see if -lpmapi is available - timer_aix_LIBS= - timer_aix_LIBS_SAVE="$LIBS" - AS_IF([test "$timer_aix_happy" = "yes"], - [AC_CHECK_LIB([pmapi], - [pm_cycles], - [LIBS="$LIBS -lpmapi" - timer_aix_LIBS="-lpmapi"], - [timer_aix_LIBS=""])]) - - # get us a HAVE_PM_CYCLES #define - AS_IF([test "$timer_aix_happy" = "yes"], - [AC_CHECK_FUNCS([pm_cycles]) - AC_CHECK_HEADERS([pmapi.h])]) - LIBS="$timer_aix_LIBS_SAVE" - - AS_IF([test "$timer_aix_happy" = "no" && \ - test "$timer_aix_should_use" = "1"], - [AC_MSG_ERROR([AIX timer requested but not available. Aborting.])]) - - AC_SUBST(timer_aix_LIBS) - - AS_IF([test "$timer_aix_happy" = "yes"], - [$1], - [$2]) -]) diff --git a/opal/mca/timer/aix/owner.txt b/opal/mca/timer/aix/owner.txt deleted file mode 100644 index 52bb44ba68e..00000000000 --- a/opal/mca/timer/aix/owner.txt +++ /dev/null @@ -1,7 +0,0 @@ -# -# owner/status file -# owner: institution that is responsible for this package -# status: e.g. active, maintenance, unmaintained -# -owner: IBM? -status: unmaintained diff --git a/opal/mca/timer/aix/timer_aix.h b/opal/mca/timer/aix/timer_aix.h deleted file mode 100644 index 4b149bb63c4..00000000000 --- a/opal/mca/timer/aix/timer_aix.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2014 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#ifndef OPAL_MCA_TIMER_AIX_TIMER_AIX_H -#define OPAL_MCA_TIMER_AIX_TIMER_AIX_H - -#include - -BEGIN_C_DECLS - -typedef uint64_t opal_timer_t; - -extern opal_timer_t opal_timer_aix_freq_mhz; -extern opal_timer_t opal_timer_aix_freq; - -static inline opal_timer_t -opal_timer_base_get_usec() -{ - timebasestruct_t t; - uint64_t retval; - - read_real_time(&t, TIMEBASE_SZ); - time_base_to_time(&t, TIMEBASE_SZ); - retval = (t.tb_high * 1000000) + t.tb_low / 1000; - - return retval; -} - -static inline opal_timer_t -opal_timer_base_get_cycles() -{ -#ifdef HAVE_PM_CYCLES - return opal_timer_base_get_usec() * opal_timer_aix_freq_mhz; -#else - return 0; -#endif -} - -static inline opal_timer_t -opal_timer_base_get_freq() -{ - return opal_timer_aix_freq;; -} - - -#ifdef HAVE_PM_CYCLES -#define OPAL_TIMER_CYCLE_NATIVE 0 -#define OPAL_TIMER_CYCLE_SUPPORTED 1 -#else -#define OPAL_TIMER_CYCLE_NATIVE 0 -#define OPAL_TIMER_CYCLE_SUPPORTED 0 -#endif -#define OPAL_TIMER_USEC_NATIVE 1 -#define OPAL_TIMER_USEC_SUPPORTED 1 - -END_C_DECLS - -#endif diff --git a/opal/mca/timer/aix/timer_aix_component.c b/opal/mca/timer/aix/timer_aix_component.c deleted file mode 100644 index 6b3eb960527..00000000000 --- a/opal/mca/timer/aix/timer_aix_component.c +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ -/* - * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2015 Los Alamos National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "opal_config.h" - -#include "opal/constants.h" -#include "opal/mca/timer/timer.h" -#include "opal/mca/timer/aix/timer_aix.h" - -#include -#ifdef HAVE_PMAPI_H -#include -#endif - -opal_timer_t opal_timer_aix_freq_mhz; -opal_timer_t opal_timer_aix_freq; - -static int opal_timer_aix_open(void); - -const opal_timer_base_component_2_0_0_t mca_timer_aix_component = { - /* First, the mca_component_t struct containing meta information - about the component itself */ - .timerc_version = { - OPAL_TIMER_BASE_VERSION_2_0_0, - - .mca_component_name = "aix", - MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION, - OPAL_RELEASE_VERSION), - - .mca_open_component = opal_timer_aix_open, - }, - .timerc_data = { - /* The component is checkpoint ready */ - MCA_BASE_METADATA_PARAM_CHECKPOINT - }, -}; - - -static int -opal_timer_aix_open(void) -{ -#ifdef HAVE_PM_CYCLES - opal_timer_aix_freq = pm_cycles(); - opal_timer_aix_freq_mhz = opal_timer_aix_freq / 1000000; -#else - opal_timer_aix_freq_mhz = 0; - opal_timer_aix_freq = 0; -#endif - - return OPAL_SUCCESS; -}