Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build (e5ec5241) · Commits · Software / OSDI20 Artifacts / mariadb

configure.in

+0 −4

Original line number	Diff line number	Diff line
		@@ -739,10 +739,6 @@ AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
		# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
		AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))

		# For sem_xxx functions on Solaris 2.6
		AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
		MYSQL_CHECK_ZLIB_WITH_COMPRESS

		# For large pages support
		if test "$TARGET_LINUX" = "true"
		then

include/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
		my_list.h my_alloc.h typelib.h
		pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
		my_xml.h mysql_embed.h \
		my_semaphore.h my_pthread.h my_no_pthread.h \
		my_pthread.h my_no_pthread.h \
		errmsg.h my_global.h my_net.h \
		my_getopt.h sslopt-longopts.h my_dir.h \
		sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

include/my_semaphore.h

deleted100644 → 0

+0 −64

Original line number	Diff line number	Diff line
		/*
		* Module: semaphore.h
		*
		* Purpose:
		* Semaphores aren't actually part of the PThreads standard.
		* They are defined by the POSIX Standard:
		*
		* POSIX 1003.1b-1993 (POSIX.1b)
		*
		* Pthreads-win32 - POSIX Threads Library for Win32
		* Copyright (C) 1998
		*
		* This library is free software; you can redistribute it and/or
		* modify it under the terms of the GNU Library General Public
		* License as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
		*
		* This library is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* Library General Public License for more details.
		*
		* You should have received a copy of the GNU Library General Public
		* License along with this library; if not, write to the Free
		* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
		* MA 02111-1307, USA
		*/

		/* This is hacked by Monty to be included in mysys library */

		#ifndef _my_semaphore_h_
		#define _my_semaphore_h_

		#ifdef THREAD

		C_MODE_START
		#ifdef HAVE_SEMAPHORE_H
		#include <semaphore.h>
		#elif !defined(__bsdi__)
		#ifdef __WIN__
		typedef HANDLE sem_t;
		#else
		typedef struct {
		pthread_mutex_t mutex;
		pthread_cond_t cond;
		uint count;
		} sem_t;
		#endif /* __WIN__ */

		int sem_init(sem_t * sem, int pshared, unsigned int value);
		int sem_destroy(sem_t * sem);
		int sem_trywait(sem_t * sem);
		int sem_wait(sem_t * sem);
		int sem_post(sem_t * sem);
		int sem_post_multiple(sem_t * sem, unsigned int count);
		int sem_getvalue(sem_t * sem, unsigned int * sval);

		#endif /* !__bsdi__ */

		C_MODE_END

		#endif /* THREAD */

		#endif /* !_my_semaphore_h_ */

mysys/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
		my_sync.c my_getopt.c my_mkdir.c \
		default_modify.c default.c \
		my_compress.c checksum.c \
		my_net.c my_semaphore.c my_port.c my_sleep.c \
		my_net.c my_port.c my_sleep.c \
		charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
		my_gethostbyname.c rijndael.c my_aes.c sha1.c \
		my_handler.c my_netware.c my_largepage.c \

mysys/my_semaphore.c

deleted100644 → 0

+0 −103

Original line number	Diff line number	Diff line
		/* Copyright (C) 2002-2003 MySQL AB

		This program is free software; you can redistribute it and/or modify
		it under the terms of the GNU General Public License as published by
		the Free Software Foundation; version 2 of the License.

		This program is distributed in the hope that it will be useful,
		but WITHOUT ANY WARRANTY; without even the implied warranty of
		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		GNU General Public License for more details.

		You should have received a copy of the GNU General Public License
		along with this program; if not, write to the Free Software
		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */

		/*
		Simple implementation of semaphores, needed to compile MySQL on systems
		that doesn't support semaphores.
		*/

		#include <my_global.h>
		#include <my_semaphore.h>
		#include <errno.h>

		#if !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) && defined(THREAD)

		int sem_init(sem_t * sem, int pshared, uint value)
		{
		sem->count=value;
		pthread_cond_init(&sem->cond, 0);
		pthread_mutex_init(&sem->mutex, 0);
		return 0;
		}

		int sem_destroy(sem_t * sem)
		{
		int err1,err2;
		err1=pthread_cond_destroy(&sem->cond);
		err2=pthread_mutex_destroy(&sem->mutex);
		if (err1 \|\| err2)
		{
		errno=err1 ? err1 : err2;
		return -1;
		}
		return 0;
		}

		int sem_wait(sem_t * sem)
		{
		if ((errno=pthread_mutex_lock(&sem->mutex)))
		return -1;
		while (!sem->count)
		pthread_cond_wait(&sem->cond, &sem->mutex);
		if (errno)
		return -1;
		sem->count--; /* mutex is locked here */
		pthread_mutex_unlock(&sem->mutex);
		return 0;
		}

		int sem_trywait(sem_t * sem)
		{
		if ((errno=pthread_mutex_lock(&sem->mutex)))
		return -1;
		if (sem->count)
		sem->count--;
		else
		errno=EAGAIN;
		pthread_mutex_unlock(&sem->mutex);
		return errno ? -1 : 0;
		}


		int sem_post(sem_t * sem)
		{
		if ((errno=pthread_mutex_lock(&sem->mutex)))
		return -1;
		sem->count++;
		pthread_mutex_unlock(&sem->mutex); /* does it really matter what to do */
		pthread_cond_signal(&sem->cond); /* first: x_unlock or x_signal ? */
		return 0;
		}

		int sem_post_multiple(sem_t * sem, uint count)
		{
		if ((errno=pthread_mutex_lock(&sem->mutex)))
		return -1;
		sem->count+=count;
		pthread_mutex_unlock(&sem->mutex); /* does it really matter what to do */
		pthread_cond_broadcast(&sem->cond); /* first: x_unlock or x_broadcast ? */
		return 0;
		}

		int sem_getvalue(sem_t * sem, uint *sval)
		{
		if ((errno=pthread_mutex_lock(&sem->mutex)))
		return -1;
		*sval=sem->count;
		pthread_mutex_unlock(&sem->mutex);
		return 0;
		}

		#endif /* !defined(__WIN__) && !defined(HAVE_SEMAPHORE_H) && defined(THREAD) */