Attachment 118069 Details for Bug 160233 – pr_160233_devel_pinba_engine.txt

pr_160233_devel_pinba_engine.txt

pr_160233_devel_pinba_engine.txt (text/plain), 3.72 KB, created by Michael Scheidell on 2012-01-05 13:08:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scheidell

Created: 2012-01-05 13:08:28 UTC

Size: 3.72 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/pinba_engine/Makefile,v
>retrieving revision 1.2
>diff -u -u -r1.2 Makefile
>--- Makefile	19 Mar 2011 13:15:21 -0000	1.2
>+++ Makefile	5 Jan 2012 13:01:01 -0000
>@@ -6,12 +6,11 @@
> #
> 
> PORTNAME=	pinba_engine
>-PORTVERSION=	2009.12.24
>+PORTVERSION=	2011.08.18
> PORTREVISION=	1
> CATEGORIES=	devel
>-MASTER_SITES=	http://aston2.com/~raven/unix/pinba/ \
>- 		http://mks-chel.ru/~raven/FreeBSD/pinba/
>-DISTNAME=	pinba_engine-200912240755
>+MASTER_SITES=	https://github.com/tony2001/pinba_engine/tarball/${GITVERSION}/
>+DISTNAME=	tony2001-pinba_engine-${GITVERSION}
> 
> MAINTAINER=	raven428@gmail.com
> COMMENT=	Mysql-engine part of statistics server for PHP
>@@ -22,18 +21,29 @@
> 		${LOCALBASE}/lib/mysql/plugin:${MYSQL_PORTDIR} \
>  		${NONEXISTENT}:${MYSQL_PORTDIR}:configure
> 
>+GITVERSION=	3a0cb51
>+FETCH_ARGS=	-pRr
>+
> WRKSRC=		${WRKDIR}/${DISTNAME}
> USE_MYSQL=	yes
>-WANT_MYSQL_VER=	51
>+IGNORE_WITH_MYSQL=	323 40 41 50
>+
> MYSQL_PORTDIR=	${PORTSDIR}/databases/mysql${MYSQL_VER}-server
> MYSQL_WRKSRC=	$$(cd ${MYSQL_PORTDIR} && ${MAKE} -V WRKSRC)
> 
>+USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
>+USE_LDCONFIG=	${PREFIX}/lib/mysql/plugin
>+
>+AUTOMAKE_ARGS+=	--add-missing --copy --force-missing
>+LIBTOOLIZE_ARGS+=--force --copy
>+ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
>+
> CONFIGURE_ARGS+=	\
> 		--with-mysql=${MYSQL_WRKSRC} \
> 		--libdir=${PREFIX}/lib/mysql/plugin
> CFLAGS+=	-I${LOCALBASE}/include/mysql
>-USE_LDCONFIG=	${PREFIX}/lib/mysql/plugin
> 
> SUB_FILES=	pkg-message
> .if !defined(NOPORTDOCS)
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/devel/pinba_engine/distinfo,v
>retrieving revision 1.2
>diff -u -u -r1.2 distinfo
>--- distinfo	3 Jul 2011 14:58:30 -0000	1.2
>+++ distinfo	5 Jan 2012 13:01:01 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (pinba_engine-200912240755.tar.gz) = 5822a7859e86e24796531a002aa3e866e98a83e6fdf7726356dd5f8ab311f082
>-SIZE (pinba_engine-200912240755.tar.gz) = 607588
>+SHA256 (tony2001-pinba_engine-3a0cb51.tar.gz) = 73a98a8b8ea4485857b730da11b9842efe73b9af37650120a3b255cbc866c081
>+SIZE (tony2001-pinba_engine-3a0cb51.tar.gz) = 50033
>Index: files/patch-src__ha_pinba.cc
>===================================================================
>RCS file: /home/pcvs/ports/devel/pinba_engine/files/patch-src__ha_pinba.cc,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-src__ha_pinba.cc
>--- files/patch-src__ha_pinba.cc	7 Jan 2010 23:52:46 -0000	1.1
>+++ files/patch-src__ha_pinba.cc	5 Jan 2012 13:01:01 -0000
>@@ -1,6 +1,34 @@
>---- ./src/ha_pinba.cc.orig	2009-12-23 23:55:04.000000000 -0500
>-+++ ./src/ha_pinba.cc	2010-01-07 16:22:50.000000000 -0500
>-@@ -283,6 +283,7 @@
>+--- ./src/ha_pinba.cc.orig	2011-07-26 18:52:53.000000000 +0400
>++++ ./src/ha_pinba.cc	2011-08-27 18:58:00.000000000 +0400
>+@@ -45,6 +45,10 @@
>+ 
>+ #include "ha_pinba.h"
>+ 
>++#ifdef PINBA_ENGINE_HAVE_PTHREAD_SETAFFINITY_NP
>++#include <pthread_np.h>
>++#endif
>++
>+ #ifdef PINBA_ENGINE_MYSQL_VERSION_5_5
>+ # define pinba_free(a, b) my_free(a)
>+ #else
>+@@ -427,13 +431,13 @@
>+ 		unsigned long mask;
>+ 
>+ 		mask = 1;
>+-		pthread_setaffinity_np(collector_thread, sizeof(mask), (cpu_set_t *)&mask);
>++		pthread_setaffinity_np(collector_thread, sizeof(mask), (cpuset_t *)&mask);
>+ 		
>+ 		mask = 2;
>+-		pthread_setaffinity_np(data_thread, sizeof(mask), (cpu_set_t *)&mask);
>++		pthread_setaffinity_np(data_thread, sizeof(mask), (cpuset_t *)&mask);
>+ 		
>+ 		mask = 4;
>+-		pthread_setaffinity_np(stats_thread, sizeof(mask), (cpu_set_t *)&mask);
>++		pthread_setaffinity_np(stats_thread, sizeof(mask), (cpuset_t *)&mask);
>+ #endif
>+ 	}
>+ 
>+@@ -452,6 +456,7 @@
>  	int error = 0;
>  	DBUG_ENTER("pinba_engine_shutdown");
>

Actions: View

Attachments on bug 160233: 118068 | 118069