Commit4c49f27

Artur Zakirov

committed

Merge branch 'PGPRO9_5' into PGPRO_contrib_dicts

2 parents0829b20 +dccfe47 commit4c49f27Copy full SHA for 4c49f27

File tree

+1721

-550

lines changed

+1721

-550

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`# contrib/pg_pathman/Makefile`
`2`	`2`
`3`		`-`
`4`	`3`	`MODULE_big = pg_pathman`
`5`	`4`	`OBJS = init.o pg_pathman.o dsm_array.o rangeset.o pl_funcs.o worker.o$(WIN32RES)`
`6`	`5`
`@@ -37,4 +36,4 @@ isolationcheck: \| submake-isolation`
`37`	`36`	`$(pg_isolation_regress_check)\`
`38`	`37`	`--temp-config=$(top_srcdir)/$(subdir)/conf.add\`
`39`	`38`	`--outputdir=./isolation_output\`
`40`		`-$(ISOLATIONCHECKS)`
	`39`	`+$(ISOLATIONCHECKS)`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,13 @@ typedef struct DsmConfig`
`28`	`28`
`29`	`29`	`staticDsmConfig*dsm_cfg=NULL;`
`30`	`30`
`31`		`-typedefintBlockHeader;`
	`31`	`+/*`
	`32`	`+ * Block header`
	`33`	`+ *`
	`34`	`+ * Its size must be 4 bytes for 32bit and 8 bytes for 64bit. Otherwise it could`
	`35`	`+ * screw up an alignment (for example on Sparc9)`
	`36`	`+ */`
	`37`	`+typedefuintptr_tBlockHeader;`
`32`	`38`	`typedefBlockHeader*BlockHeaderPtr;`
`33`	`39`
`34`	`40`	`#defineFREE_BIT 0x80000000`
`@@ -43,6 +49,16 @@ typedef BlockHeader* BlockHeaderPtr;`
`43`	`49`	`#defineset_length(header,length) \`
`44`	`50`	`((length) \| ((*header) & FREE_BIT))`
`45`	`51`
	`52`	`+/*`
	`53`	`+ * Amount of memory that need to be requested in shared memory to store dsm`
	`54`	`+ * config`
	`55`	`+ */`
	`56`	`+Size`
	`57`	`+get_dsm_shared_size()`
	`58`	`+{`
	`59`	`+return (Size)MAXALIGN(sizeof(DsmConfig));`
	`60`	`+}`
	`61`	`+`
`46`	`62`	`/*`
`47`	`63`	`* Initialize dsm config for arrays`
`48`	`64`	`*/`

Comments

(0)