Skip to content

Commit 6d66211

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 a91f7b9 commit 6d66211

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};
@@ -165,8 +170,8 @@ int opal_timer_linux_open(void)
165170
struct timespec res;
166171
if( 0 == clock_getres(CLOCK_MONOTONIC, &res)) {
167172
opal_timer_linux_freq = 1.e3;
168-
opal_timer_base_get_cycles = opal_timer_base_get_cycles_clock_gettime;
169-
opal_timer_base_get_usec = opal_timer_base_get_usec_clock_gettime;
173+
opal_timer_base_get_cycles = opal_timer_linux_get_cycles_clock_gettime;
174+
opal_timer_base_get_usec = opal_timer_linux_get_usec_clock_gettime;
170175
return ret;
171176
}
172177
#else
@@ -175,13 +180,13 @@ int opal_timer_linux_open(void)
175180
#endif /* OPAL_HAVE_CLOCK_GETTIME && (0 == OPAL_TIMER_MONOTONIC) */
176181
}
177182
ret = opal_timer_linux_find_freq();
178-
opal_timer_base_get_cycles = opal_timer_base_get_cycles_sys_timer;
179-
opal_timer_base_get_usec = opal_timer_base_get_usec_sys_timer;
183+
opal_timer_base_get_cycles = opal_timer_linux_get_cycles_sys_timer;
184+
opal_timer_base_get_usec = opal_timer_linux_get_usec_sys_timer;
180185
return ret;
181186
}
182187

183188
#if OPAL_HAVE_CLOCK_GETTIME
184-
opal_timer_t opal_timer_base_get_usec_clock_gettime(void)
189+
opal_timer_t opal_timer_linux_get_usec_clock_gettime(void)
185190
{
186191
struct timespec tp = {.tv_sec = 0, .tv_nsec = 0};
187192

@@ -190,7 +195,7 @@ opal_timer_t opal_timer_base_get_usec_clock_gettime(void)
190195
return (tp.tv_sec * 1e6 + tp.tv_nsec/1000);
191196
}
192197

193-
opal_timer_t opal_timer_base_get_cycles_clock_gettime(void)
198+
opal_timer_t opal_timer_linux_get_cycles_clock_gettime(void)
194199
{
195200
struct timespec tp = {.tv_sec = 0, .tv_nsec = 0};
196201

@@ -200,7 +205,7 @@ opal_timer_t opal_timer_base_get_cycles_clock_gettime(void)
200205
}
201206
#endif /* OPAL_HAVE_CLOCK_GETTIME */
202207

203-
opal_timer_t opal_timer_base_get_cycles_sys_timer(void)
208+
opal_timer_t opal_timer_linux_get_cycles_sys_timer(void)
204209
{
205210
#if OPAL_HAVE_SYS_TIMER_GET_CYCLES
206211
return opal_sys_timer_get_cycles();
@@ -210,7 +215,7 @@ opal_timer_t opal_timer_base_get_cycles_sys_timer(void)
210215
}
211216

212217

213-
opal_timer_t opal_timer_base_get_usec_sys_timer(void)
218+
opal_timer_t opal_timer_linux_get_usec_sys_timer(void)
214219
{
215220
#if OPAL_HAVE_SYS_TIMER_GET_CYCLES
216221
/* freq is in MHz, so this gives usec */
@@ -224,5 +229,3 @@ opal_timer_t opal_timer_base_get_freq(void)
224229
{
225230
return opal_timer_linux_freq * 1000000;
226231
}
227-
228-

0 commit comments

Comments
 (0)