openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File pfmon-3.5.diff of Package pfmon

--- pfmon/Makefile
+++ pfmon/Makefile
@@ -152,7 +152,7 @@ depend:
 install: subdirs $(TARGET)
 	-mkdir -p $(DESTDIR)$(BINDIR)
 	$(INSTALL) -m 755 pfmon $(DESTDIR)$(BINDIR)/pfmon
-	-ln -sf $(DESTDIR)$(BINDIR)/pfmon $(DESTDIR)$(BINDIR)/pfmon_gen
+	-ln -sf pfmon $(DESTDIR)$(BINDIR)/pfmon_gen
 
 $(SMPL_MOD_LIB) subdirs: 
 	@set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d all; done
--- pfmon/pfmon.h
+++ pfmon/pfmon.h
@@ -117,7 +117,7 @@ typedef enum {
 /* 
  * max number of cpus (threads) supported
  */
-#define PFMON_MAX_CPUS		__CPU_SETSIZE /* MUST BE power of 2 */
+#define PFMON_MAX_CPUS		(sizeof(cpu_set_t)*8)
 /*
  * max number of PMU models supported
  */
@@ -125,11 +125,9 @@ typedef enum {
 
 #define PFMON_BITMASK_BITS	(sizeof(unsigned long)<<3)
 
-#if PFMON_MAX_CPUS > PFMON_MAX_PMUS
-#define PFMON_BITMASK_COUNT	(PFMON_MAX_CPUS/PFMON_BITMASK_BITS)
-#else
-#define PFMON_BITMASK_COUNT	(PFMON_MAX_PMUS/PFMON_BITMASK_BITS)
-#endif
+#define PFMON_BITMASK_COUNT	\
+  (PFMON_MAX_CPUS > PFMON_MAX_PMUS ? PFMON_MAX_CPUS/PFMON_BITMASK_BITS \
+   : PFMON_MAX_PMUS/PFMON_BITMASK_BITS)
 
 #define PFMON_MAX_FILENAME_LEN	256	/* max for output/input files */
 #define PFMON_MAX_CMDLINE_LEN	1024	/* per-task mode max cmdline length /proc/cmdline */
--- tests/Makefile
+++ tests/Makefile
@@ -58,7 +58,7 @@ libxyz.so:
 	$(CC) -fPIC $(CFLAGS) $(LDFLAGS) -o libxyz.so -shared sharedlib2.c
 
 itlb_test.o: itlb_test.c
-	$(CC) -c -falign-functions=16384 $<
+	$(CC) $(CFLAGS) -c -falign-functions=16384 $<
 
 clean:
 	rm -f *.o $(ALL_TARGETS)
--- tests/unasig.c
+++ tests/unasig.c
@@ -127,6 +127,6 @@ main(int argc, char **argv)
 	count = argc > 1 ? strtoul(argv[1], NULL, 10) : 1;
 	pace  = argc > 2 ? strtoul(argv[2], NULL, 10) : 0;
 
-	return do_una_test(count, pace);
+	return do_una_test();
 }

Places

File pfmon-3.5.diff of Package pfmon

Places