Commit5ee80cc

committed

Fix shared resources allocation

1 parent01e366b commit5ee80ccCopy full SHA for 5ee80cc

File tree

+26

-3

lines changed

+26

-3

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,16 @@ typedef BlockHeader* BlockHeaderPtr;`
`43`	`43`	`#defineset_length(header,length) \`
`44`	`44`	`((length) \| ((*header) & FREE_BIT))`
`45`	`45`
	`46`	`+/*`
	`47`	`+ * Amount of memory that need to be requested in shared memory to store dsm`
	`48`	`+ * config`
	`49`	`+ */`
	`50`	`+Size`
	`51`	`+get_dsm_shared_size()`
	`52`	`+{`
	`53`	`+return (Size)MAXALIGN(sizeof(DsmConfig));`
	`54`	`+}`
	`55`	`+`
`46`	`56`	`/*`
`47`	`57`	`* Initialize dsm config for arrays`
`48`	`58`	`*/`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,15 @@ static bool validate_range_constraint(Expr , PartRelationInfo , Datum *, Datum`
`34`	`34`	`staticboolvalidate_hash_constraint(Exprexpr,PartRelationInfoprel,int*hash);`
`35`	`35`	`staticintcmp_range_entries(constvoidp1,constvoidp2);`
`36`	`36`
	`37`	`+Size`
	`38`	`+pathman_memsize()`
	`39`	`+{`
	`40`	`+Sizesize;`
	`41`	`+`
	`42`	`+size=get_dsm_shared_size()+MAXALIGN(sizeof(PathmanState));`
	`43`	`+returnsize;`
	`44`	`+}`
	`45`	`+`
`37`	`46`	`void`
`38`	`47`	`init_shmem_config()`
`39`	`48`	`{`
`@@ -596,4 +605,4 @@ remove_relation_info(Oid relid)`
`596`	`605`	`}`
`597`	`606`	`prel->children_count=0;`
`598`	`607`	`hash_search(relations, (constvoid*)&key,HASH_REMOVE,0);`
`599`		`-}`
	`608`	`+}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ int irange_list_length(List *rangeset);`
`156`	`156`	`boolirange_list_find(Listrangeset,intindex,boollossy);`
`157`	`157`
`158`	`158`	`/* Dynamic shared memory functions */`
	`159`	`+Sizeget_dsm_shared_size(void);`
`159`	`160`	`voidinit_dsm_config(void);`
`160`	`161`	`boolinit_dsm_segment(size_tblocks_count,size_tblock_size);`
`161`	`162`	`voidinit_dsm_table(size_tblock_size,size_tstart,size_tend);`
`@@ -171,6 +172,7 @@ HTAB *range_restrictions;`
`171`	`172`	`boolinitialization_needed;`
`172`	`173`
`173`	`174`	`/* initialization functions */`
	`175`	`+Sizepathman_memsize(void);`
`174`	`176`	`voidinit_shmem_config(void);`
`175`	`177`	`voidload_config(void);`
`176`	`178`	`voidcreate_relations_hashtable(void);`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,10 @@ _PG_init(void)`
`127`	`127`	`}`
`128`	`128`	`#endif`
`129`	`129`
	`130`	`+/* Request additional shared resources */`
	`131`	`+RequestAddinShmemSpace(pathman_memsize());`
	`132`	`+RequestAddinLWLocks(3);`
	`133`	`+`
`130`	`134`	`set_rel_pathlist_hook_original=set_rel_pathlist_hook;`
`131`	`135`	`set_rel_pathlist_hook=pathman_set_rel_pathlist_hook;`
`132`	`136`	`shmem_startup_hook_original=shmem_startup_hook;`
`@@ -325,8 +329,6 @@ handle_modification_query(Query *parse)`
`325`	`329`	`staticvoid`
`326`	`330`	`pathman_shmem_startup(void)`
`327`	`331`	`{`
`328`		`-/* Initialize locks */`
`329`		`-RequestAddinLWLocks(3);`
`330`	`332`
`331`	`333`	`/* Allocate shared memory objects */`
`332`	`334`	`LWLockAcquire(AddinShmemInitLock,LW_EXCLUSIVE);`

Comments

(0)