More fixes to shared ispell

Author: vbwagner

contrib/shared_ispell/src/shared_ispell.c

@@ -166,7 +166,7 @@ _PG_fini(void)
 static void
 ispell_shmem_startup()
 {
-	bool	found = FALSE;
+	bool	found = false;
 	char   *segment;
 
 	if (prev_shmem_startup_hook)
@@ -177,27 +177,19 @@ ispell_shmem_startup()
 	 */
 	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
 
-	segment = ShmemInitStruct(SEGMENT_NAME,
-							max_ispell_mem_size(),
-							&found);
+	segment = ShmemInitStruct(SEGMENT_NAME, max_ispell_mem_size(), &found);
 	segment_info = (SegmentInfo *) segment;
 
 	/* Was the shared memory segment already initialized? */
 	if (!found)
 	{
-		if (segment == NULL) {
-			ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				errmsg("Cannot acquire %d kB of shared memory",
-					max_ispell_mem_size_kb)));
-		}
 		memset(segment, 0, max_ispell_mem_size());
 
-		#if PG_VERSION_NUM >= 90600
+#if PG_VERSION_NUM >= 90600
 		segment_info->lock = &(GetNamedLWLockTranche("shared_ispell"))->lock;
-		#else
+#else
 		segment_info->lock  = LWLockAssign();
-		#endif
+#endif
 		segment_info->firstfree = segment + MAXALIGN(sizeof(SegmentInfo));
 		segment_info->available = max_ispell_mem_size()
 			- (int)(segment_info->firstfree - segment);
@@ -291,11 +283,15 @@ clean_dict_affix(IspellDict *dict)
  * of the shared memory (using SegmentInfo->lock).
  */
 static void
-init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
+init_shared_dict(DictInfo *info, MemoryContext infoCntx,
+				 char *dictFile, char *affFile, char *stopFile)
 {
-	int size;
+	int			size;
 	SharedIspellDict *shdict = NULL;
-	SharedStopList	 *shstop = NULL;
+	SharedStopList *shstop = NULL;
+	MemoryContext oldctx;
+
+	oldctx = MemoryContextSwitchTo(infoCntx);
 
 	/* DICTIONARY + AFFIXES */
 
@@ -315,7 +311,7 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 	/* load the dictionary (word list) if not yet defined */
 	if (shdict == NULL)
 	{
-		IspellDict *dict;
+		IspellDict  *dict;
 
 		dict = (IspellDict *) palloc0(sizeof(IspellDict));
 
@@ -337,11 +333,13 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 		 */
 		if (info->dict.useFlagAliases)
 		{
-			int i;
+			int			i;
+
 			dict->useFlagAliases = true;
 			dict->lenAffixData = info->dict.lenAffixData;
 			dict->nAffixData = info->dict.nAffixData;
 			dict->AffixData = (char **) palloc0(dict->nAffixData * sizeof(char *));
+
 			for (i = 0; i < dict->nAffixData; i++)
 			{
 				dict->AffixData[i] = palloc0(strlen(info->dict.AffixData[i]) + 1);
@@ -419,8 +417,9 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 	else
 		memset(info->stopFile, 0, sizeof(info->stopFile));
 
+	MemoryContextSwitchTo(oldctx);
 	/* save current context as long-lived */
-	info->saveCntx = CurrentMemoryContext;
+	info->infoCntx = infoCntx;
 }
 
 Datum dispell_init(PG_FUNCTION_ARGS);
@@ -582,7 +581,15 @@ dispell_init(PG_FUNCTION_ARGS)
 	/* search if the dictionary is already initialized */
 	LWLockAcquire(segment_info->lock, LW_EXCLUSIVE);
 
-	init_shared_dict(info, dictFile, affFile, stopFile);
+	/*
+	 * Current context is a long lived context. Create child context to store
+	 * DictInfo internal data.
+	 */
+	info->infoCntx = AllocSetContextCreate(CurrentMemoryContext,
+										   "shared_ispell context",
+										   ALLOCSET_DEFAULT_SIZES);
+
+	init_shared_dict(info, info->infoCntx, dictFile, affFile, stopFile);
 
 	LWLockRelease(segment_info->lock);
 
@@ -611,8 +618,7 @@ dispell_lexize(PG_FUNCTION_ARGS)
 	/* do we need to reinit the dictionary? was the dict reset since the lookup */
 	if (timestamp_cmp_internal(info->lookup, segment_info->lastReset) < 0)
 	{
-		DictInfo		saveInfo = *info;
-		MemoryContext	ctx;
+		DictInfo	saveInfo = *info;
 
 		/* relock in exclusive mode */
 		LWLockRelease(segment_info->lock);
@@ -623,15 +629,11 @@ dispell_lexize(PG_FUNCTION_ARGS)
 		 * info here
 		 */
 
-		MemoryContextResetAndDeleteChildren(saveInfo.saveCntx);
-		ctx = MemoryContextSwitchTo(saveInfo.saveCntx);
-
+		MemoryContextResetAndDeleteChildren(saveInfo.infoCntx);
 		MemSet(info, 0, sizeof(*info));
 
-		init_shared_dict(info, saveInfo.dictFile,
+		init_shared_dict(info, saveInfo.infoCntx, saveInfo.dictFile,
 						 saveInfo.affixFile, saveInfo.stopFile);
-
-		MemoryContextSwitchTo(ctx);
 	}
 
 	res = NINormalizeWord(&(info->dict), txt);
@@ -721,8 +723,8 @@ shstrcpy(char *str)
 static SPNode *
 copySPNode(SPNode *node)
 {
-	int		i;
-	SPNode *copy = NULL;
+	int			i;
+	SPNode	   *copy = NULL;
 
 	if (node == NULL)
 		return NULL;
@@ -739,8 +741,8 @@ copySPNode(SPNode *node)
 static int
 sizeSPNode(SPNode *node)
 {
-	int i;
-	int size = 0;
+	int			i;
+	int			size = 0;
 
 	if (node == NULL)
 		return 0;
@@ -852,9 +854,9 @@ sizeIspellDict(IspellDict *dict, char *dictFile, char *affixFile)
 Datum
 dispell_list_dicts(PG_FUNCTION_ARGS)
 {
-	FuncCallContext	   *funcctx;
-	TupleDesc			tupdesc;
-	SharedIspellDict   *dict;
+	FuncCallContext *funcctx;
+	TupleDesc	tupdesc;
+	SharedIspellDict *dict;
 
 	/* init on the first call */
 	if (SRF_IS_FIRSTCALL())

contrib/shared_ispell/src/shared_ispell.h

@@ -69,7 +69,7 @@ typedef struct DictInfo
 	SharedStopList	   *shstop;
 
 	/* MemoryContext of dict local content */
-	MemoryContext		saveCntx;
+	MemoryContext		infoCntx;
 } DictInfo;
 
 #endif