mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
b2e946136d
Moved IF(test,column,NULL) code to 4.0 Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h. Removed some CR's in os2 files. Docs/manual.texi: Changelog include/global.h: Fix for BIGINT problem on AIX include/my_no_pthread.h: Fixed typo libmysql/Makefile.shared: Fix for BIGINT problem on AIX mysql-test/mysql-test-run.sh: Fix to find xterm on AIX 4.3 mysql-test/r/bigint.result: Fix for BIGINT problem on AIX mysql-test/r/func_if.result: Change results for IF() after reverting change. mysql-test/t/bigint.test: Fix for BIGINT problem on AIX mysys/Makefile.am: Fix for BIGINT problem on AIX mysys/my_gethostbyname.c: Cleanup mysys/my_init.c: Cleanup mysys/my_net.c: Cleanup mysys/my_os2cond.c: Space & CRLF cleanup mysys/my_os2dirsrch.c: Space & CRLF cleanup mysys/my_os2dirsrch.h: Space & CRLF cleanup mysys/my_os2dlfcn.c: Space & CRLF cleanup mysys/my_os2file64.c: Space & CRLF cleanup mysys/my_os2mutex.c: Space & CRLF cleanup mysys/my_os2thread.c: Space & CRLF cleanup mysys/my_os2tls.c: Space & CRLF cleanup mysys/mysys_priv.h: cleanup mysys/thr_rwlock.c: cleanup sql/ha_innobase.cc: Removed usage of sprintf() Fixed missing end \0 which caused control characters to appear in SHOW INNODB STATUS sql/item_cmpfunc.cc: Reverted change for IF() sql/mysqld.cc: Fix for shutdown on AIX
188 lines
4.4 KiB
C
188 lines
4.4 KiB
C
/* Copyright (C) Yuri Dario & 2000 MySQL AB
|
|
All the above parties has a full, independent copyright to
|
|
the following code, including the right to use the code in
|
|
any manner without any demands from the other parties.
|
|
|
|
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 */
|
|
|
|
/*****************************************************************************
|
|
** The following is a simple implementation of posix conditions
|
|
*****************************************************************************/
|
|
|
|
#undef SAFE_MUTEX /* Avoid safe_mutex redefinitions */
|
|
#include "mysys_priv.h"
|
|
#if defined(THREAD) && defined(OS2)
|
|
#include <m_string.h>
|
|
//#undef getpid
|
|
#include <process.h>
|
|
#include <sys/timeb.h>
|
|
|
|
int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr)
|
|
{
|
|
APIRET rc = 0;
|
|
HEV event;
|
|
cond->waiting=0;
|
|
/* Warp3 FP29 or Warp4 FP4 or better required */
|
|
rc = DosCreateEventSem( NULL, &cond->semaphore, 0x0800, 0);
|
|
if (rc)
|
|
return ENOMEM;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int pthread_cond_destroy(pthread_cond_t *cond)
|
|
{
|
|
APIRET rc;
|
|
|
|
do {
|
|
rc = DosCloseEventSem(cond->semaphore);
|
|
if (rc == 301) DosPostEventSem(cond->semaphore);
|
|
} while (rc == 301);
|
|
if (rc)
|
|
return EINVAL;
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
|
|
{
|
|
APIRET rc;
|
|
int rval;
|
|
|
|
rval = 0;
|
|
cond->waiting++;
|
|
|
|
if (mutex) pthread_mutex_unlock(mutex);
|
|
|
|
rc = DosWaitEventSem(cond->semaphore,SEM_INDEFINITE_WAIT);
|
|
if (rc != 0)
|
|
rval = EINVAL;
|
|
|
|
if (mutex) pthread_mutex_lock(mutex);
|
|
|
|
cond->waiting--;
|
|
|
|
return rval;
|
|
}
|
|
|
|
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|
struct timespec *abstime)
|
|
{
|
|
struct timeb curtime;
|
|
int result;
|
|
long timeout;
|
|
APIRET rc;
|
|
int rval;
|
|
|
|
_ftime(&curtime);
|
|
timeout= ((long) (abstime->ts_sec - curtime.time)*1000L +
|
|
(long)((abstime->ts_nsec/1000) - curtime.millitm)/1000L);
|
|
if (timeout < 0) /* Some safety */
|
|
timeout = 0L;
|
|
|
|
rval = 0;
|
|
cond->waiting++;
|
|
|
|
if (mutex) pthread_mutex_unlock(mutex);
|
|
|
|
rc = DosWaitEventSem(cond->semaphore, timeout);
|
|
if (rc != 0)
|
|
rval = ETIME;
|
|
|
|
if (mutex) pthread_mutex_lock(mutex);
|
|
|
|
cond->waiting--;
|
|
|
|
return rval;
|
|
}
|
|
|
|
|
|
int pthread_cond_signal(pthread_cond_t *cond)
|
|
{
|
|
APIRET rc;
|
|
|
|
/* Bring the next thread off the condition queue: */
|
|
rc = DosPostEventSem(cond->semaphore);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int pthread_cond_broadcast(pthread_cond_t *cond)
|
|
{
|
|
int i;
|
|
APIRET rc;
|
|
|
|
/*
|
|
* Enter a loop to bring all threads off the
|
|
* condition queue:
|
|
*/
|
|
i = cond->waiting;
|
|
while (i--) rc = DosPostEventSem(cond->semaphore);
|
|
|
|
return 0 ;
|
|
}
|
|
|
|
|
|
int pthread_attr_init(pthread_attr_t *connect_att)
|
|
{
|
|
connect_att->dwStackSize = 0;
|
|
connect_att->dwCreatingFlag = 0;
|
|
connect_att->priority = 0;
|
|
return 0;
|
|
}
|
|
|
|
int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack)
|
|
{
|
|
connect_att->dwStackSize=stack;
|
|
return 0;
|
|
}
|
|
|
|
int pthread_attr_setprio(pthread_attr_t *connect_att,int priority)
|
|
{
|
|
connect_att->priority=priority;
|
|
return 0;
|
|
}
|
|
|
|
int pthread_attr_destroy(pthread_attr_t *connect_att)
|
|
{
|
|
bzero((gptr) connect_att,sizeof(*connect_att));
|
|
return 0;
|
|
}
|
|
|
|
/****************************************************************************
|
|
** Fix localtime_r() to be a bit safer
|
|
****************************************************************************/
|
|
|
|
struct tm *localtime_r(const time_t *timep,struct tm *tmp)
|
|
{
|
|
if (*timep == (time_t) -1) /* This will crash win32 */
|
|
{
|
|
bzero(tmp,sizeof(*tmp));
|
|
}
|
|
else
|
|
{
|
|
struct tm *res=localtime(timep);
|
|
if (!res) /* Wrong date */
|
|
{
|
|
bzero(tmp,sizeof(*tmp)); /* Keep things safe */
|
|
return 0;
|
|
}
|
|
*tmp= *res;
|
|
}
|
|
return tmp;
|
|
}
|
|
#endif /* __WIN__ */
|