Skip to content

Commit c7504c9

Browse files
committed
timer/linux: rename component-specific functions
Several component-specific functions were named with a prefix of "opal_timer_base", which was quite confusing. Rename them to have a prefix "opal_timer_linux" to make it clear that they are here in this component (and different than *actual* opal_timer_base symbols). Signed-off-by: Jeff Squyres <[email protected]> (cherry picked from commit 616f20c)
1 parent b68bffb commit c7504c9

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

opal/mca/timer/linux/timer_linux_component.c

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,22 @@
3434
#include "opal/constants.h"
3535
#include "opal/util/show_help.h"
3636

37-
static opal_timer_t opal_timer_base_get_cycles_sys_timer(void);
38-
static opal_timer_t opal_timer_base_get_usec_sys_timer(void);
37+
static opal_timer_t opal_timer_linux_get_cycles_sys_timer(void);
38+
static opal_timer_t opal_timer_linux_get_usec_sys_timer(void);
3939

4040
#if OPAL_HAVE_CLOCK_GETTIME
41-
static opal_timer_t opal_timer_base_get_cycles_clock_gettime(void);
42-
static opal_timer_t opal_timer_base_get_usec_clock_gettime(void);
43-
opal_timer_t (*opal_timer_base_get_cycles)(void) = opal_timer_base_get_cycles_clock_gettime;
44-
opal_timer_t (*opal_timer_base_get_usec)(void) = opal_timer_base_get_usec_clock_gettime;
41+
static opal_timer_t opal_timer_linux_get_cycles_clock_gettime(void);
42+
static opal_timer_t opal_timer_linux_get_usec_clock_gettime(void);
43+
44+
opal_timer_t (*opal_timer_base_get_cycles)(void) =
45+
opal_timer_linux_get_cycles_clock_gettime;
46+
opal_timer_t (*opal_timer_base_get_usec)(void) =
47+
opal_timer_linux_get_usec_clock_gettime;
4548
#else
46-
opal_timer_t (*opal_timer_base_get_cycles)(void) = opal_timer_base_get_cycles_sys_timer;
47-
opal_timer_t (*opal_timer_base_get_usec)(void) = opal_timer_base_get_usec_sys_timer;
49+
opal_timer_t (*opal_timer_base_get_cycles)(void) =
50+
opal_timer_linux_get_cycles_sys_timer;
51+
opal_timer_t (*opal_timer_base_get_usec)(void) =
52+
opal_timer_linux_get_usec_sys_timer;
4853
#endif /* OPAL_HAVE_CLOCK_GETTIME */
4954

5055
static opal_timer_t opal_timer_linux_freq = {0};
@@ -169,8 +174,8 @@ int opal_timer_linux_open(void)
169174
struct timespec res;
170175
if( 0 == clock_getres(CLOCK_MONOTONIC, &res)) {
171176
opal_timer_linux_freq = 1.e3;
172-
opal_timer_base_get_cycles = opal_timer_base_get_cycles_clock_gettime;
173-
opal_timer_base_get_usec = opal_timer_base_get_usec_clock_gettime;
177+
opal_timer_base_get_cycles = opal_timer_linux_get_cycles_clock_gettime;
178+
opal_timer_base_get_usec = opal_timer_linux_get_usec_clock_gettime;
174179
return ret;
175180
}
176181
#else
@@ -179,13 +184,13 @@ int opal_timer_linux_open(void)
179184
#endif /* OPAL_HAVE_CLOCK_GETTIME && (0 == OPAL_TIMER_MONOTONIC) */
180185
}
181186
ret = opal_timer_linux_find_freq();
182-
opal_timer_base_get_cycles = opal_timer_base_get_cycles_sys_timer;
183-
opal_timer_base_get_usec = opal_timer_base_get_usec_sys_timer;
187+
opal_timer_base_get_cycles = opal_timer_linux_get_cycles_sys_timer;
188+
opal_timer_base_get_usec = opal_timer_linux_get_usec_sys_timer;
184189
return ret;
185190
}
186191

187192
#if OPAL_HAVE_CLOCK_GETTIME
188-
opal_timer_t opal_timer_base_get_usec_clock_gettime(void)
193+
opal_timer_t opal_timer_linux_get_usec_clock_gettime(void)
189194
{
190195
struct timespec tp = {.tv_sec = 0, .tv_nsec = 0};
191196

@@ -194,7 +199,7 @@ opal_timer_t opal_timer_base_get_usec_clock_gettime(void)
194199
return (tp.tv_sec * 1e6 + tp.tv_nsec/1000);
195200
}
196201

197-
opal_timer_t opal_timer_base_get_cycles_clock_gettime(void)
202+
opal_timer_t opal_timer_linux_get_cycles_clock_gettime(void)
198203
{
199204
struct timespec tp = {.tv_sec = 0, .tv_nsec = 0};
200205

@@ -204,7 +209,7 @@ opal_timer_t opal_timer_base_get_cycles_clock_gettime(void)
204209
}
205210
#endif /* OPAL_HAVE_CLOCK_GETTIME */
206211

207-
opal_timer_t opal_timer_base_get_cycles_sys_timer(void)
212+
opal_timer_t opal_timer_linux_get_cycles_sys_timer(void)
208213
{
209214
#if OPAL_HAVE_SYS_TIMER_GET_CYCLES
210215
return opal_sys_timer_get_cycles();
@@ -214,7 +219,7 @@ opal_timer_t opal_timer_base_get_cycles_sys_timer(void)
214219
}
215220

216221

217-
opal_timer_t opal_timer_base_get_usec_sys_timer(void)
222+
opal_timer_t opal_timer_linux_get_usec_sys_timer(void)
218223
{
219224
#if OPAL_HAVE_SYS_TIMER_GET_CYCLES
220225
/* freq is in MHz, so this gives usec */
@@ -228,5 +233,3 @@ opal_timer_t opal_timer_base_get_freq(void)
228233
{
229234
return opal_timer_linux_freq * 1000000;
230235
}
231-
232-

0 commit comments

Comments
 (0)