Merge pull request #167 from darkfronza/PG-325_fix_deadlock_master
PG-325: Fix deadlock.pull/170/head
commit
eb9e1c1d49
|
@ -1701,8 +1701,8 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
|
||||||
char parentid_txt[32];
|
char parentid_txt[32];
|
||||||
pgssSharedState *pgss = pgsm_get_ss();
|
pgssSharedState *pgss = pgsm_get_ss();
|
||||||
HTAB *pgss_hash = pgsm_get_hash();
|
HTAB *pgss_hash = pgsm_get_hash();
|
||||||
char *query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN);
|
char *query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN + 1);
|
||||||
char *parent_query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN);
|
char *parent_query_txt = (char*) palloc0(PGSM_QUERY_MAX_LEN + 1);
|
||||||
|
|
||||||
/* Safety check... */
|
/* Safety check... */
|
||||||
if (!IsSystemInitialized())
|
if (!IsSystemInitialized())
|
||||||
|
@ -2073,11 +2073,12 @@ pg_stat_monitor_internal(FunctionCallInfo fcinfo,
|
||||||
values[i++] = BoolGetDatum(toplevel);
|
values[i++] = BoolGetDatum(toplevel);
|
||||||
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
|
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
|
||||||
}
|
}
|
||||||
pfree(query_txt);
|
|
||||||
pfree(parent_query_txt);
|
|
||||||
/* clean up and return the tuplestore */
|
/* clean up and return the tuplestore */
|
||||||
LWLockRelease(pgss->lock);
|
LWLockRelease(pgss->lock);
|
||||||
|
|
||||||
|
pfree(query_txt);
|
||||||
|
pfree(parent_query_txt);
|
||||||
|
|
||||||
tuplestore_donestoring(tupstore);
|
tuplestore_donestoring(tupstore);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue