File papi-codecleanup.patch of Package papi

Overview Repositories Revisions Requests Users Attributes Meta

File papi-codecleanup.patch of Package papi (Revision e1ecbb2bfc072592cd91ba0e6ef56c0f)

Currently displaying revision e1ecbb2bfc072592cd91ba0e6ef56c0f , Show latest

Index: src/libpfm-3.y/lib/pfmlib_gen_ia32.c
===================================================================
--- src/libpfm-3.y/lib/pfmlib_gen_ia32.c.orig	2009-08-24 13:46:50.000000000 +0200
+++ src/libpfm-3.y/lib/pfmlib_gen_ia32.c	2010-03-23 12:18:52.639012146 +0100
@@ -257,7 +257,7 @@ pfm_gen_ia32_init(void)
 		unsigned int val;
 		pmu_eax_t eax;
 		pmu_edx_t edx;
-	} eax, ecx, edx, ebx;
+	} eax = { 0 }, ecx = { 0 }, edx = { 0 }, ebx = { 0 };
 	unsigned int num_cnt, i;
 	int ret;
 
Index: src/ctests/mendes-alt.c
===================================================================
--- src/ctests/mendes-alt.c.orig	2009-09-10 22:19:48.000000000 +0200
+++ src/ctests/mendes-alt.c	2010-03-23 12:18:52.647012189 +0100
@@ -20,13 +20,13 @@ static int EventSet = PAPI_NULL;
 
 extern int TESTS_QUIET;         /* Declared in test_utils.c */
 
-int main(argc, argv)
-int argc;
-char *argv[];
+void funcX(double a[MAX], double b[MAX], int n);
+void funcA(double a[MAX], double b[MAX], int n);
+
+int main(int argc, char *argv[])
 {
    int i, retval;
    double a[MAX], b[MAX];
-   void funcX(), funcA();
 
    tests_quiet(argc, argv);     /* Set TESTS_QUIET variable */
 
@@ -147,9 +147,7 @@ char *argv[];
    exit(1);
 }
 
-void funcX(a, b, n)
-double a[MAX], b[MAX];
-int n;
+void funcX(double a[MAX], double b[MAX], int n)
 {
    int i, k;
    for (k = 0; k < TIMES; k++)
@@ -157,9 +155,7 @@ int n;
          a[i] = a[i] * b[i] + 1.;
 }
 
-void funcA(a, b, n)
-double a[MAX], b[MAX];
-int n;
+void funcA(double a[MAX], double b[MAX], int n)
 {
    int i, k;
    double t[MAX];
Index: src/libpfm-3.y/lib/pfmlib_itanium2.c
===================================================================
--- src/libpfm-3.y/lib/pfmlib_itanium2.c.orig	2008-07-28 18:45:53.000000000 +0200
+++ src/libpfm-3.y/lib/pfmlib_itanium2.c	2010-03-23 15:09:31.404012807 +0100
@@ -229,7 +229,7 @@ static unsigned int
 check_inst_retired_events(pfmlib_input_param_t *inp, unsigned long *retired_mask)
 {
 	int code;
-	int c;
+	int c, ret;
 	unsigned int i, count, found = 0;
 	unsigned long umask, mask;
 
@@ -238,9 +238,11 @@ check_inst_retired_events(pfmlib_input_p
 	count = inp->pfp_event_count;
 	mask  = 0;
 	for(i=0; i < count; i++) {
-		pfm_get_event_code(inp->pfp_events[i].event, &c);
+		ret = pfm_get_event_code(inp->pfp_events[i].event, &c);
 		if (c == code)  {
-			pfm_ita2_get_event_umask(inp->pfp_events[i].event, &umask);
+			ret = pfm_ita2_get_event_umask(inp->pfp_events[i].event, &umask);
+			if (ret != PFMLIB_SUCCESS)
+				break;
 			switch(umask) {
 				case 0: mask |= 1;
 					break;
@@ -556,7 +558,7 @@ done:
 		pc[j].reg_addr    = pc[j].reg_alt_addr = assign[j];
 
 		pd[j].reg_num  = assign[j];
-		pd[j].reg_addr = pd[j].reg_addr = assign[j];
+		pd[j].reg_addr = pd[j].reg_alt_addr = assign[j];
 
 		__pfm_vbprintf("[PMC%u(pmc%u)=0x%06lx thres=%d es=0x%02x plm=%d umask=0x%x pm=%d ism=0x%x oi=%d] %s\n",
 				assign[j],
@@ -813,7 +815,7 @@ pfm_dispatch_opcm(pfmlib_input_param_t *
 
 		pc[pos].reg_num     = 8;
 		pc[pos].reg_value   = reg.pmc_val;
-		pc[pos].reg_addr  = pc[pos].reg_addr = 8;
+		pc[pos].reg_addr    = pc[pos].reg_alt_addr = 8;
 		pos++;
 
 		/*
Index: src/libpfm-3.y/lib/pfmlib_montecito.c
===================================================================
--- src/libpfm-3.y/lib/pfmlib_montecito.c.orig	2008-09-19 22:06:39.000000000 +0200
+++ src/libpfm-3.y/lib/pfmlib_montecito.c	2010-03-23 12:18:52.747512244 +0100
@@ -766,7 +766,7 @@ pfm_dispatch_iear(pfmlib_input_param_t *
 
 	pc[pos1].reg_num     = 37; /* PMC37 is I-EAR config register */
 	pc[pos1].reg_value   = reg.pmc_val;
-	pc[pos1].reg_addr  = pc[pos1].reg_addr = 37;
+	pc[pos1].reg_addr  = pc[pos1].reg_alt_addr = 37;
 	pos1++;
 
 	pd[pos2].reg_num  = 34;

Places

File papi-codecleanup.patch of Package papi (Revision e1ecbb2bfc072592cd91ba0e6ef56c0f)

Places