Fixing compilation errors
This commit is contained in:
		
							parent
							
								
									1da0f1a096
								
							
						
					
					
						commit
						543dd51d8f
					
				
							
								
								
									
										2
									
								
								emu.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								emu.c
									
									
									
									
									
								
							| @ -483,7 +483,7 @@ load_clock_offsets(struct ovni_emu *emu) | |||||||
| 	char buf[1024]; | 	char buf[1024]; | ||||||
| 	int i, rank; | 	int i, rank; | ||||||
| 	double offset, std; | 	double offset, std; | ||||||
| 	char host[HOST_NAME_MAX]; | 	char host[OVNI_MAX_HOSTNAME]; | ||||||
| 	struct ovni_loom *loom; | 	struct ovni_loom *loom; | ||||||
| 	struct ovni_trace *trace; | 	struct ovni_trace *trace; | ||||||
| 	struct ovni_stream *stream; | 	struct ovni_stream *stream; | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								emu.h
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								emu.h
									
									
									
									
									
								
							| @ -138,7 +138,7 @@ struct ovni_cpu { | |||||||
| /* State of each loom on post-process */ | /* State of each loom on post-process */ | ||||||
| struct ovni_loom { | struct ovni_loom { | ||||||
| 	size_t nprocs; | 	size_t nprocs; | ||||||
| 	char hostname[HOST_NAME_MAX]; | 	char hostname[OVNI_MAX_HOSTNAME]; | ||||||
| 
 | 
 | ||||||
| 	int max_ncpus; | 	int max_ncpus; | ||||||
| 	int max_phyid; | 	int max_phyid; | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								ovni.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								ovni.c
									
									
									
									
									
								
							| @ -9,6 +9,7 @@ | |||||||
| #include <linux/limits.h> | #include <linux/limits.h> | ||||||
| #include <errno.h> | #include <errno.h> | ||||||
| #include <sys/stat.h> | #include <sys/stat.h> | ||||||
|  | #include <sys/syscall.h> | ||||||
| #include <sys/mman.h> | #include <sys/mman.h> | ||||||
| #include <stdatomic.h> | #include <stdatomic.h> | ||||||
| #include <assert.h> | #include <assert.h> | ||||||
| @ -68,7 +69,7 @@ create_trace_stream() | |||||||
| 	char path[PATH_MAX]; | 	char path[PATH_MAX]; | ||||||
| 
 | 
 | ||||||
| 	fprintf(stderr, "create thread stream tid=%d gettid=%d rproc.proc=%d rproc.ready=%d\n", | 	fprintf(stderr, "create thread stream tid=%d gettid=%d rproc.proc=%d rproc.ready=%d\n", | ||||||
| 			rthread.tid, gettid(), rproc.proc, rproc.ready); | 			rthread.tid, syscall(SYS_gettid), rproc.proc, rproc.ready); | ||||||
| 
 | 
 | ||||||
| 	snprintf(path, PATH_MAX, "%s/thread.%d", rproc.dir, rthread.tid); | 	snprintf(path, PATH_MAX, "%s/thread.%d", rproc.dir, rthread.tid); | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								ovni.h
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								ovni.h
									
									
									
									
									
								
							| @ -15,6 +15,7 @@ | |||||||
| #define OVNI_MAX_THR 32 | #define OVNI_MAX_THR 32 | ||||||
| #define OVNI_MAX_LOOM 4 | #define OVNI_MAX_LOOM 4 | ||||||
| #define OVNI_TRACEDIR "ovni" | #define OVNI_TRACEDIR "ovni" | ||||||
|  | #define OVNI_MAX_HOSTNAME 512 | ||||||
| 
 | 
 | ||||||
| /* Reserved buffer for event allocation per thread */ | /* Reserved buffer for event allocation per thread */ | ||||||
| #define OVNI_MAX_EV_BUF (2 * 1024LL * 1024LL) /* 2 MiB */ | #define OVNI_MAX_EV_BUF (2 * 1024LL * 1024LL) /* 2 MiB */ | ||||||
| @ -97,7 +98,7 @@ struct ovni_rproc { | |||||||
| 
 | 
 | ||||||
| 	int app; | 	int app; | ||||||
| 	int proc; | 	int proc; | ||||||
| 	char loom[HOST_NAME_MAX]; | 	char loom[OVNI_MAX_HOSTNAME]; | ||||||
| 	int ncpus; | 	int ncpus; | ||||||
| 	clockid_t clockid; | 	clockid_t clockid; | ||||||
| 	char procdir[PATH_MAX]; | 	char procdir[PATH_MAX]; | ||||||
|  | |||||||
| @ -6,6 +6,8 @@ | |||||||
| #include <math.h> | #include <math.h> | ||||||
| #include <unistd.h> | #include <unistd.h> | ||||||
| 
 | 
 | ||||||
|  | #include "ovni.h" | ||||||
|  | 
 | ||||||
| static double | static double | ||||||
| get_time() | get_time() | ||||||
| { | { | ||||||
| @ -37,7 +39,7 @@ cmp_double(const void *pa, const void *pb) | |||||||
| 
 | 
 | ||||||
| /* Called by rank 0 */ | /* Called by rank 0 */ | ||||||
| static void | static void | ||||||
| get_offset(double *timetable, char (*hosttable)[HOST_NAME_MAX], int nproc, int nsamples) | get_offset(double *timetable, char (*hosttable)[OVNI_MAX_HOSTNAME], int nproc, int nsamples) | ||||||
| { | { | ||||||
| 	int i, j; | 	int i, j; | ||||||
| 	double median, mean, var, std; | 	double median, mean, var, std; | ||||||
| @ -95,7 +97,7 @@ main(int argc, char *argv[]) | |||||||
| 	double *t; | 	double *t; | ||||||
| 	double *timetable; | 	double *timetable; | ||||||
| 	int i, rank, nprocs, nsamples; | 	int i, rank, nprocs, nsamples; | ||||||
| 	char (*hosttable)[HOST_NAME_MAX]; | 	char (*hosttable)[OVNI_MAX_HOSTNAME]; | ||||||
| 
 | 
 | ||||||
| 	MPI_Init(&argc, &argv); | 	MPI_Init(&argc, &argv); | ||||||
| 
 | 
 | ||||||
| @ -130,7 +132,7 @@ main(int argc, char *argv[]) | |||||||
| 		t[i] = get_time(); | 		t[i] = get_time(); | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if(gethostname(hosttable[rank], HOST_NAME_MAX) != 0) | 	if(gethostname(hosttable[rank], OVNI_MAX_HOSTNAME) != 0) | ||||||
| 	{ | 	{ | ||||||
| 		perror("gethostname"); | 		perror("gethostname"); | ||||||
| 		exit(EXIT_FAILURE); | 		exit(EXIT_FAILURE); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Kevin Sala
						Kevin Sala