Commit4bd983b

committed

Patches from Cyril Velter to make shared-memory-conflict-detection code

work in BeOS port.

1 parent5c1b004 commit4bd983bCopy full SHA for 4bd983b

File tree

+40

-9

lines changed

+40

-9

lines changed

Lines changed: 26 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,15 @@`
`3`	`3`	`* shm.c`
`4`	`4`	`* BeOS System V Shared Memory Emulation`
`5`	`5`	`*`
`6`		`- * Copyright (c) 1999-2000, Cyril VELTER`
	`6`	`+ * Copyright (c) 1999-2001, Cyril VELTER`
`7`	`7`	`*`
`8`	`8`	`*-------------------------------------------------------------------------`
`9`	`9`	`*/`
`10`	`10`
`11`	`11`	`#include"postgres.h"`
`12`	`12`	`#include<stdio.h>`
`13`	`13`	`#include<OS.h>`
	`14`	`+#include<errno.h>`
`14`	`15`
`15`	`16`	`/* Emulating SYS shared memory with beos areas. WARNING : fork clone`
`16`	`17`	`areas in copy on write mode */`
`@@ -68,11 +69,30 @@ int shmctl(int shmid, int flag, struct shmid_ds* dummy)`
`68`	`69`	`}`
`69`	`70`	`if (flag==IPC_STAT)`
`70`	`71`	`{`
`71`		`-/* Is there a way to check existence of an area given its ID?`
`72`		`- * For now, punt and assume it does not exist.`
`73`		`- */`
`74`		`-errno=EINVAL;`
`75`		`-return-1;`
	`72`	`+/* Find any SYSV area with the shmid in its name */`
	`73`	`+`
	`74`	`+area_infoinf;`
	`75`	`+team_infoinfteam;`
	`76`	`+int32cookteam=0;`
	`77`	`+charname[50];`
	`78`	`+sprintf(name,"SYSV_IPC %d",shmid);`
	`79`	`+`
	`80`	`+dummy->shm_nattch=0;`
	`81`	`+`
	`82`	`+while (get_next_team_info(&cookteam,&infteam)==B_OK)`
	`83`	`+{`
	`84`	`+int32cook=0;`
	`85`	`+while (get_next_area_info(infteam.team,&cook,&inf)==B_OK)`
	`86`	`+{`
	`87`	`+if (strcmp(name,inf.name)==0)`
	`88`	`+{`
	`89`	`+dummy->shm_nattch++;`
	`90`	`+}`
	`91`	`+}`
	`92`	`+}`
	`93`	`+`
	`94`	`+errno=0;`
	`95`	`+return0;`
`76`	`96`	`}`
`77`	`97`	`errno=EINVAL;`
`78`	`98`	`return-1;`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* support.c`
`4`	`4`	`* BeOS Support functions`
`5`	`5`	`*`
`6`		`- * Copyright (c) 1999-2000, Cyril VELTER`
	`6`	`+ * Copyright (c) 1999-2001, Cyril VELTER`
`7`	`7`	`*`
`8`	`8`	`*-------------------------------------------------------------------------`
`9`	`9`	`*/`
`@@ -279,6 +279,8 @@ void beos_backend_startup(void)`
`279`	`279`	`delete_area(inf.area);`
`280`	`280`	`/* Find the postmaster area */`
`281`	`281`	`area_postmaster=find_area(inf.name);`
	`282`	`+/* Compute new area name */`
	`283`	`+sprintf(nvnom,"SYSV_IPC %d",area_postmaster);`
`282`	`284`	`/* Clone it at the exact same address */`
`283`	`285`	`clone_area(nvnom,&area_address,B_CLONE_ADDRESS,B_READ_AREA\|B_WRITE_AREA,area_postmaster);`
`284`	`286`	`}`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.62 2001/03/13 01:17:06 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.63 2001/03/18 18:22:08 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -540,11 +540,18 @@ CreateLockFile(const char *filename, bool amPostmaster,`
`540`	`540`
`541`	`541`	`/*`
`542`	`542`	`* Check to see if the other process still exists`
	`543`	`+ *`
	`544`	`+ * Normally kill() will fail with ESRCH if the given PID doesn't`
	`545`	`+ * exist. BeOS returns EINVAL for some silly reason, however.`
`543`	`546`	`*/`
`544`	`547`	`if (other_pid!=my_pid)`
`545`	`548`	`{`
`546`	`549`	`if (kill(other_pid,0)==0\|\|`
`547`		`-errno!=ESRCH)`
	`550`	`+(errno!=ESRCH`
	`551`	`+#ifdef__BEOS__`
	`552`	`+&&errno!=EINVAL`
	`553`	`+#endif`
	`554`	`+))`
`548`	`555`	`{`
`549`	`556`	`/* lockfile belongs to a live process */`
`550`	`557`	`fprintf(stderr,"Lock file \"%s\" already exists.\n",`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ typedef unsigned char slock_t;`
`20`	`20`	`#defineIPC_EXCL 1024`
`21`	`21`	`#defineIPC_PRIVATE 234564`
`22`	`22`	`#defineIPC_NOWAIT2048`
	`23`	`+#defineIPC_STAT 4096`
`23`	`24`
`24`	`25`	`#defineEACCESS 2048`
`25`	`26`	`#defineEIDRM 4096`
`@@ -47,6 +48,7 @@ struct sembuf`
`47`	`48`	`structshmid_ds`
`48`	`49`	`{`
`49`	`50`	`intdummy;`
	`51`	`+intshm_nattch;`
`50`	`52`	`};`
`51`	`53`
`52`	`54`	`intsemctl(intsemId,intsemNum,intflag,unionsemun);`

Comments

(0)