NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit164ef6f

committed

Fixes:

Originally, I thought the problem was caused by a function that getscalled as a normal function where we want to return a value, and as asignal handler where we need to have it accept a parameter (the signalnumber) and it returns nothing, I was going to case the function name inthe signal call as (void (*)(int)).Looking at all the source, it turns out this function only gets used asa signal handler, so I set an int parameter and return void.I have removed the Linux defines because they are not needed. BSD letthis sloppiness slide. Linux gave a compile error.Submitted by: Bruce Momjian <maillist@candle.pha.pa.us>

1 parent4d837e3 commit164ef6fCopy full SHA for 164ef6f

File tree

2 files changed

-23

lines changed

src/backend/storage
- lmgr
  - proc.c
- proc.h

2 files changed

-23

lines changed

`‎src/backend/storage/lmgr/proc.c`

Lines changed: 7 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.5 1996/08/01 05:11:33 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -46,7 +46,7 @@`
`46`	`46`	`* This is so that we can support more backends. (system-wide semaphore`
`47`	`47`	`* sets run out pretty fast.) -ay 4/95`
`48`	`48`	`*`
`49`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.4 1996/07/31 02:19:09 scrappy Exp $`
	`49`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.5 1996/08/01 05:11:33 scrappy Exp $`
`50`	`50`	`*/`
`51`	`51`	`#include<sys/time.h>`
`52`	`52`	`#ifndefWIN32`
`@@ -95,11 +95,6 @@ PROC *MyProc = NULL;`
`95`	`95`	`staticvoidProcKill(intexitStatus,intpid);`
`96`	`96`	`staticvoidProcGetNewSemKeyAndNum(IPCKeykey,intsemNum);`
`97`	`97`	`staticvoidProcFreeSem(IpcSemaphoreKeysemKey,intsemNum);`
`98`		`-#if defined(PORTNAME_linux)`
`99`		`-externvoidHandleDeadLock(int);`
`100`		`-#else`
`101`		`-externintHandleDeadLock(void);`
`102`		`-#endif`
`103`	`98`	`/*`
`104`	`99`	`* InitProcGlobal -`
`105`	`100`	`* initializes the global process table. We put it here so that`
`@@ -628,13 +623,8 @@ ProcAddLock(SHM_QUEUE *elem)`
`628`	`623`	`* up my semaphore.`
`629`	`624`	`* --------------------`
`630`	`625`	`*/`
`631`		`-#if defined(PORTNAME_linux)`
`632`		`-void`
`633`		`-HandleDeadLock(inti)`
`634`		`-#else`
`635`		`-int`
`636`		`-HandleDeadLock()`
`637`		`-#endif`
	`626`	`+void`
	`627`	`+HandleDeadLock(intsig)`
`638`	`628`	`{`
`639`	`629`	`LOCK*lock;`
`640`	`630`	`intsize;`
`@@ -654,7 +644,7 @@ HandleDeadLock()`
`654`	`644`	`if (IpcSemaphoreGetCount(MyProc->sem.semId,MyProc->sem.semNum)==`
`655`	`645`	`IpcSemaphoreDefaultStartValue) {`
`656`	`646`	`UnlockLockTable();`
`657`		`-return1;`
	`647`	`+return;`
`658`	`648`	`}`
`659`	`649`
`660`	`650`	`/*`
`@@ -671,7 +661,7 @@ HandleDeadLock()`
`671`	`661`	`if (MyProc->links.prev==INVALID_OFFSET\|\|`
`672`	`662`	`MyProc->links.next==INVALID_OFFSET) {`
`673`	`663`	`UnlockLockTable();`
`674`		`-return(1);`
	`664`	`+return;`
`675`	`665`	`}`
`676`	`666`
`677`	`667`	`lock=MyProc->waitLock;`
`@@ -708,7 +698,7 @@ HandleDeadLock()`
`708`	`698`	`UnlockLockTable();`
`709`	`699`
`710`	`700`	`elog(NOTICE,"Timeout -- possible deadlock");`
`711`		`-return0;`
	`701`	`+return;`
`712`	`702`	`}`
`713`	`703`
`714`	`704`	`void`

`‎src/backend/storage/proc.h`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: proc.h,v 1.1.1.1 1996/07/09 06:21:53 scrappy Exp $`
	`9`	`+ * $Id: proc.h,v 1.2 1996/08/01 05:10:16 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -116,11 +116,7 @@ extern PROC ProcWakeup(PROC proc, int errType);`
`116`	`116`	`externintProcGetId(void);`
`117`	`117`	`externintProcLockWakeup(PROC_QUEUEqueue,charltable,char*lock);`
`118`	`118`	`externvoidProcAddLock(SHM_QUEUE*elem);`
`119`		`-#if defined(PORTNAME_linux)`
`120`		`-externintHandleDeadLock(int);`
`121`		`-#else`
`122`		`-externintHandleDeadLock(void);`
`123`		`-#endif`
	`119`	`+externvoidHandleDeadLock(intsig);`
`124`	`120`	`externvoidProcReleaseSpins(PROC*proc);`
`125`	`121`	`externvoidProcFreeAllSemaphores(void);`
`126`	`122`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit164ef6f

File tree

2 files changed

2 files changed

`‎src/backend/storage/lmgr/proc.c`

`‎src/backend/storage/proc.h`

0 commit comments