Merge pull request #14 from postgrespro/pp5692

funny-falcon · web-flow · commit cc1b91530fda · 2021-11-29T12:31:09.000+03:00
ee: Use memory context instead of malloc in ATX handling
diff --git a/src/multimaster.c b/src/multimaster.c
@@ -366,7 +366,7 @@ MtmDeserializeTransactionState(void *ctx)
 static void *
 MtmSuspendTransaction(void)
 {
-	MtmCurrentTrans *ctx = malloc(sizeof(MtmCurrentTrans));
+	MtmCurrentTrans *ctx = MemoryContextAlloc(CurTransactionContext, sizeof(MtmCurrentTrans));
 
 	*ctx = MtmTx;
 	return ctx;
@@ -376,7 +376,7 @@ static void
 MtmResumeTransaction(void *ctx)
 {
 	MtmTx = *(MtmCurrentTrans *) ctx;
-	free(ctx);
+	pfree(ctx);
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ MtmDeserializeTransactionState(void *ctx)`
`366`	`366`	`static void *`
`367`	`367`	`MtmSuspendTransaction(void)`
`368`	`368`	`{`
`369`		`- MtmCurrentTrans *ctx = malloc(sizeof(MtmCurrentTrans));`
	`369`	`+ MtmCurrentTrans *ctx = MemoryContextAlloc(CurTransactionContext, sizeof(MtmCurrentTrans));`
`370`	`370`
`371`	`371`	`*ctx = MtmTx;`
`372`	`372`	`return ctx;`
`@@ -376,7 +376,7 @@ static void`
`376`	`376`	`MtmResumeTransaction(void *ctx)`
`377`	`377`	`{`
`378`	`378`	`MtmTx = (MtmCurrentTrans ) ctx;`
`379`		`- free(ctx);`
	`379`	`+ pfree(ctx);`
`380`	`380`	`}`
`381`	`381`	`#endif`
`382`	`382`