Skip to content
Snippets Groups Projects
Commit 40a8bb60 authored by janthorbecke@gmail.com's avatar janthorbecke@gmail.com
Browse files

Merge branch 'master' of https://gitlab.com/geophysicsdelft/OpenSource

parents 8cacbaf2 078d8ee4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 919 deletions
fdelmodc/threadAffinity.c
+ 2
− 1
View file @ 40a8bb60
......@@ -35,13 +35,14 @@ int sched_getaffinity(pid_t pid, size_t cpu_size, cpu_set_t *cpu_set)
{
int32_t core_count = 0;
size_t len = sizeof(core_count);
int i;
int ret = sysctlbyname(SYSCTL_CORE_COUNT, &core_count, &len, 0, 0);
if (ret) {
printf("error while get core count %d\n", ret);
return -1;
}
cpu_set->count = 0;
for (int i = 0; i < core_count; i++) {
for (i = 0; i < core_count; i++) {
cpu_set->count |= (1 << i);
}
......
fdelmodc/wallclock_time.c deleted 100644 → 0
+ 1
− 33
View file @ 8cacbaf2
#include <time.h>
#include <sys/time.h>
#include <stdio.h>
/**
* function used to calculate wallclock times
*
* AUTHOR:
* Jan Thorbecke (janth@xs4all.nl)
* The Netherlands
**/
double wallclock_time(void)
{
struct timeval s_val;
static struct timeval b_val;
double time;
static int base=0;
gettimeofday(&s_val,0);
if (!base) {
b_val = s_val;
base = 1;
return 0.0;
}
time = (double)(s_val.tv_sec-b_val.tv_sec) +
(double)(1e-6*((double)s_val.tv_usec-(double)b_val.tv_usec));
return (double)time;
}
fdelmodc/wallclock_time.c 0 → 120000
+ 1
− 33
View file @ 40a8bb60
../utils/wallclock_time.c
\ No newline at end of file
fdelmodc3D/threadAffinity.c deleted 100644 → 0
+ 1
− 109
View file @ 8cacbaf2
#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#ifdef __USE_GNU
#include <omp.h>
#include <sched.h>
#else /* for OSX */
#include <sched.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#define CPU_SETSIZE 1024
#define SYSCTL_CORE_COUNT "machdep.cpu.core_count"
void vmess(char *fmt, ...);
typedef struct cpu_set {
uint32_t count;
} cpu_set_t;
static inline void
CPU_ZERO(cpu_set_t *cs) { cs->count = 0; }
static inline void
CPU_SET(int num, cpu_set_t *cs) { cs->count |= (1 << num); }
static inline int
CPU_ISSET(int num, cpu_set_t *cs) { return (cs->count & (1 << num)); }
int sched_getaffinity(pid_t pid, size_t cpu_size, cpu_set_t *cpu_set)
{
int32_t core_count = 0;
size_t len = sizeof(core_count);
int ret = sysctlbyname(SYSCTL_CORE_COUNT, &core_count, &len, 0, 0);
if (ret) {
printf("error while get core count %d\n", ret);
return -1;
}
cpu_set->count = 0;
for (int i = 0; i < core_count; i++) {
cpu_set->count |= (1 << i);
}
return 0;
}
#endif
/* Borrowed from util-linux-2.13-pre7/schedutils/taskset.c */
static char *cpuset_to_cstr(cpu_set_t *mask, char *str)
{
char *ptr = str;
int i, j, entry_made = 0;
for (i = 0; i < CPU_SETSIZE; i++) {
if (CPU_ISSET(i, mask)) {
int run = 0;
entry_made = 1;
for (j = i + 1; j < CPU_SETSIZE; j++) {
if (CPU_ISSET(j, mask)) run++;
else break;
}
if (!run)
sprintf(ptr, "%d,", i);
else if (run == 1) {
sprintf(ptr, "%d,%d,", i, i + 1);
i++;
} else {
sprintf(ptr, "%d-%d,", i, i + run);
i += run;
}
while (*ptr != 0) ptr++;
}
}
ptr -= entry_made;
*ptr = 0;
return(str);
}
void threadAffinity(void)
{
int thread;
cpu_set_t coremask;
char clbuf[7 * CPU_SETSIZE], hnbuf[64];
char prefix[200];
memset(clbuf, 0, sizeof(clbuf));
memset(hnbuf, 0, sizeof(hnbuf));
(void)gethostname(hnbuf, sizeof(hnbuf));
strcpy(prefix,"Hello world from");
// #pragma omp parallel private(thread, coremask, clbuf)
/* for use inside parallel region */
#pragma omp critical
{
#ifdef _OPENMP
thread = omp_get_thread_num();
#else
thread = 1;
#endif
(void)sched_getaffinity(0, sizeof(coremask), &coremask);
cpuset_to_cstr(&coremask, clbuf);
vmess("%s thread %d, on %s. (core affinity = %s)", prefix, thread, hnbuf, clbuf);
}
return;
}
fdelmodc3D/threadAffinity.c 0 → 120000
+ 1
− 109
View file @ 40a8bb60
../fdelmodc/threadAffinity.c
\ No newline at end of file
fdelmodc3D/wallclock_time.c deleted 100644 → 0
+ 1
− 33
View file @ 8cacbaf2
#include <time.h>
#include <sys/time.h>
#include <stdio.h>
/**
* function used to calculate wallclock times
*
* AUTHOR:
* Jan Thorbecke (janth@xs4all.nl)
* The Netherlands
**/
double wallclock_time(void)
{
struct timeval s_val;
static struct timeval b_val;
double time;
static int base=0;
gettimeofday(&s_val,0);
if (!base) {
b_val = s_val;
base = 1;
return 0.0;
}
time = (double)(s_val.tv_sec-b_val.tv_sec) +
(double)(1e-6*((double)s_val.tv_usec-(double)b_val.tv_usec));
return (double)time;
}
fdelmodc3D/wallclock_time.c 0 → 120000
+ 1
− 33
View file @ 40a8bb60
../utils/wallclock_time.c
\ No newline at end of file
raytime/threadAffinity.c deleted 100644 → 0
+ 1
− 109
View file @ 8cacbaf2
#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#ifdef __USE_GNU
#include <omp.h>
#include <sched.h>
#else /* for OSX */
#include <sched.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#define CPU_SETSIZE 1024
#define SYSCTL_CORE_COUNT "machdep.cpu.core_count"
void vmess(char *fmt, ...);
typedef struct cpu_set {
uint32_t count;
} cpu_set_t;
static inline void
CPU_ZERO(cpu_set_t *cs) { cs->count = 0; }
static inline void
CPU_SET(int num, cpu_set_t *cs) { cs->count |= (1 << num); }
static inline int
CPU_ISSET(int num, cpu_set_t *cs) { return (cs->count & (1 << num)); }
int sched_getaffinity(pid_t pid, size_t cpu_size, cpu_set_t *cpu_set)
{
int32_t core_count = 0;
size_t len = sizeof(core_count);
int ret = sysctlbyname(SYSCTL_CORE_COUNT, &core_count, &len, 0, 0);
if (ret) {
printf("error while get core count %d\n", ret);
return -1;
}
cpu_set->count = 0;
for (int i = 0; i < core_count; i++) {
cpu_set->count |= (1 << i);
}
return 0;
}
#endif
/* Borrowed from util-linux-2.13-pre7/schedutils/taskset.c */
static char *cpuset_to_cstr(cpu_set_t *mask, char *str)
{
char *ptr = str;
int i, j, entry_made = 0;
for (i = 0; i < CPU_SETSIZE; i++) {
if (CPU_ISSET(i, mask)) {
int run = 0;
entry_made = 1;
for (j = i + 1; j < CPU_SETSIZE; j++) {
if (CPU_ISSET(j, mask)) run++;
else break;
}
if (!run)
sprintf(ptr, "%d,", i);
else if (run == 1) {
sprintf(ptr, "%d,%d,", i, i + 1);
i++;
} else {
sprintf(ptr, "%d-%d,", i, i + run);
i += run;
}
while (*ptr != 0) ptr++;
}
}
ptr -= entry_made;
*ptr = 0;
return(str);
}
void threadAffinity(void)
{
int thread;
cpu_set_t coremask;
char clbuf[7 * CPU_SETSIZE], hnbuf[64];
char prefix[200];
memset(clbuf, 0, sizeof(clbuf));
memset(hnbuf, 0, sizeof(hnbuf));
(void)gethostname(hnbuf, sizeof(hnbuf));
strcpy(prefix,"Hello world from");
// #pragma omp parallel private(thread, coremask, clbuf)
/* for use inside parallel region */
#pragma omp critical
{
#ifdef __USE_GNU
thread = omp_get_thread_num();
#else
thread = 1;
#endif
(void)sched_getaffinity(0, sizeof(coremask), &coremask);
cpuset_to_cstr(&coremask, clbuf);
vmess("%s thread %d, on %s. (core affinity = %s)", prefix, thread, hnbuf, clbuf);
}
return;
}
raytime/threadAffinity.c 0 → 120000
+ 1
− 109
View file @ 40a8bb60
../fdelmodc/threadAffinity.c
\ No newline at end of file
raytime/wallclock_time.c deleted 100644 → 0
+ 1
− 33
View file @ 8cacbaf2
#include <time.h>
#include <sys/time.h>
#include <stdio.h>
/**
* function used to calculate wallclock times
*
* AUTHOR:
* Jan Thorbecke (janth@xs4all.nl)
* The Netherlands
**/
double wallclock_time(void)
{
struct timeval s_val;
static struct timeval b_val;
double time;
static int base=0;
gettimeofday(&s_val,0);
if (!base) {
b_val = s_val;
base = 1;
return 0.0;
}
time = (double)(s_val.tv_sec-b_val.tv_sec) +
(double)(1e-6*((double)s_val.tv_usec-(double)b_val.tv_usec));
return (double)time;
}
raytime/wallclock_time.c 0 → 120000
+ 1
− 33
View file @ 40a8bb60
../utils/wallclock_time.c
\ No newline at end of file
raytime3d/threadAffinity.c deleted 100644 → 0
+ 1
− 109
View file @ 8cacbaf2
#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#ifdef __USE_GNU
#include <omp.h>
#include <sched.h>
#else /* for OSX */
#include <sched.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#define CPU_SETSIZE 1024
#define SYSCTL_CORE_COUNT "machdep.cpu.core_count"
void vmess(char *fmt, ...);
typedef struct cpu_set {
uint32_t count;
} cpu_set_t;
static inline void
CPU_ZERO(cpu_set_t *cs) { cs->count = 0; }
static inline void
CPU_SET(int num, cpu_set_t *cs) { cs->count |= (1 << num); }
static inline int
CPU_ISSET(int num, cpu_set_t *cs) { return (cs->count & (1 << num)); }
int sched_getaffinity(pid_t pid, size_t cpu_size, cpu_set_t *cpu_set)
{
int32_t core_count = 0;
size_t len = sizeof(core_count);
int ret = sysctlbyname(SYSCTL_CORE_COUNT, &core_count, &len, 0, 0);
if (ret) {
printf("error while get core count %d\n", ret);
return -1;
}
cpu_set->count = 0;
for (int i = 0; i < core_count; i++) {
cpu_set->count |= (1 << i);
}
return 0;
}
#endif
/* Borrowed from util-linux-2.13-pre7/schedutils/taskset.c */
static char *cpuset_to_cstr(cpu_set_t *mask, char *str)
{
char *ptr = str;
int i, j, entry_made = 0;
for (i = 0; i < CPU_SETSIZE; i++) {
if (CPU_ISSET(i, mask)) {
int run = 0;
entry_made = 1;
for (j = i + 1; j < CPU_SETSIZE; j++) {
if (CPU_ISSET(j, mask)) run++;
else break;
}
if (!run)
sprintf(ptr, "%d,", i);
else if (run == 1) {
sprintf(ptr, "%d,%d,", i, i + 1);
i++;
} else {
sprintf(ptr, "%d-%d,", i, i + run);
i += run;
}
while (*ptr != 0) ptr++;
}
}
ptr -= entry_made;
*ptr = 0;
return(str);
}
void threadAffinity(void)
{
int thread;
cpu_set_t coremask;
char clbuf[7 * CPU_SETSIZE], hnbuf[64];
char prefix[200];
memset(clbuf, 0, sizeof(clbuf));
memset(hnbuf, 0, sizeof(hnbuf));
(void)gethostname(hnbuf, sizeof(hnbuf));
strcpy(prefix,"Hello world from");
// #pragma omp parallel private(thread, coremask, clbuf)
/* for use inside parallel region */
#pragma omp critical
{
#ifdef __USE_GNU
thread = omp_get_thread_num();
#else
thread = 1;
#endif
(void)sched_getaffinity(0, sizeof(coremask), &coremask);
cpuset_to_cstr(&coremask, clbuf);
vmess("%s thread %d, on %s. (core affinity = %s)", prefix, thread, hnbuf, clbuf);
}
return;
}
raytime3d/threadAffinity.c 0 → 120000
+ 1
− 109
View file @ 40a8bb60
../fdelmodc/threadAffinity.c
\ No newline at end of file
raytime3d/wallclock_time.c deleted 100644 → 0
+ 1
− 33
View file @ 8cacbaf2
#include <time.h>
#include <sys/time.h>
#include <stdio.h>
/**
* function used to calculate wallclock times
*
* AUTHOR:
* Jan Thorbecke (janth@xs4all.nl)
* The Netherlands
**/
double wallclock_time(void)
{
struct timeval s_val;
static struct timeval b_val;
double time;
static int base=0;
gettimeofday(&s_val,0);
if (!base) {
b_val = s_val;
base = 1;
return 0.0;
}
time = (double)(s_val.tv_sec-b_val.tv_sec) +
(double)(1e-6*((double)s_val.tv_usec-(double)b_val.tv_usec));
return (double)time;
}
raytime3d/wallclock_time.c 0 → 120000
+ 1
− 33
View file @ 40a8bb60
../utils/wallclock_time.c
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment