database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Remove uage of static variable from file locks.

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2002-02-10 20:28:58 +02:00
parent 9ef8d48920
commit cf39ab2ff2
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/mysql-test-run.sh
View File

@ -266,7 +266,6 @@ fi
[ -z "$COLUMNS" ] && COLUMNS=80 [ -z "$COLUMNS" ] && COLUMNS=80
E=`$EXPR $COLUMNS - 8` E=`$EXPR $COLUMNS - 8`
#DASH72=`$EXPR substr '------------------------------------------------------------------------' 1 $E`
DASH72=`$ECHO '------------------------------------------------------------------------'|$CUT -c 1-$E` DASH72=`$ECHO '------------------------------------------------------------------------'|$CUT -c 1-$E`
# on source dist, we pick up freshly build executables # on source dist, we pick up freshly build executables

17
sql/my_lock.c
View File

@ -26,10 +26,6 @@
#include <thr_alarm.h> #include <thr_alarm.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_FCNTL
static struct flock lock; /* Must be static for sun-sparc */
#endif
/* Lock a part of a file */ /* Lock a part of a file */
int my_lock(File fd,int locktype,my_off_t start,my_off_t length,myf MyFlags) int my_lock(File fd,int locktype,my_off_t start,my_off_t length,myf MyFlags)
@ -37,24 +33,25 @@ int my_lock(File fd,int locktype,my_off_t start,my_off_t length,myf MyFlags)
thr_alarm_t alarmed; thr_alarm_t alarmed;
ALARM alarm_buff; ALARM alarm_buff;
uint wait_for_alarm; uint wait_for_alarm;
struct flock m_lock;
DBUG_ENTER("my_lock"); DBUG_ENTER("my_lock");
DBUG_PRINT("my",("Fd: %d Op: %d start: %ld Length: %ld MyFlags: %d", DBUG_PRINT("my",("Fd: %d Op: %d start: %ld Length: %ld MyFlags: %d",
fd,locktype,(ulong) start,(ulong) length,MyFlags)); fd,locktype,(ulong) start,(ulong) length,MyFlags));
if (my_disable_locking) if (my_disable_locking)
DBUG_RETURN(0); /* purecov: inspected */ DBUG_RETURN(0); /* purecov: inspected */
lock.l_type=(short) locktype; m_lock.l_type=(short) locktype;
lock.l_whence=0L; m_lock.l_whence=0L;
lock.l_start=(long) start; m_lock.l_start=(long) start;
lock.l_len=(long) length; m_lock.l_len=(long) length;
wait_for_alarm=(MyFlags & MY_DONT_WAIT ? MY_HOW_OFTEN_TO_ALARM : wait_for_alarm=(MyFlags & MY_DONT_WAIT ? MY_HOW_OFTEN_TO_ALARM :
(uint) 12*60*60); (uint) 12*60*60);
if (fcntl(fd,F_SETLK,&lock) != -1) /* Check if we can lock */ if (fcntl(fd,F_SETLK,&m_lock) != -1) /* Check if we can lock */
DBUG_RETURN(0); /* Ok, file locked */ DBUG_RETURN(0); /* Ok, file locked */
DBUG_PRINT("info",("Was locked, trying with alarm")); DBUG_PRINT("info",("Was locked, trying with alarm"));
if (!thr_alarm(&alarmed,wait_for_alarm,&alarm_buff)) if (!thr_alarm(&alarmed,wait_for_alarm,&alarm_buff))
{ {
int value; int value;
while ((value=fcntl(fd,F_SETLKW,&lock)) && !thr_got_alarm(&alarmed) && while ((value=fcntl(fd,F_SETLKW,&m_lock)) && !thr_got_alarm(&alarmed) &&
errno == EINTR) ; errno == EINTR) ;
thr_end_alarm(&alarmed); thr_end_alarm(&alarmed);
if (value != -1) if (value != -1)