mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Code Activity

Bugfix for concurrent Context creation in Java and .NET.

Browse source 
Relates to #205 #245
This commit is contained in:
Christoph M. Wintersteiger 2015-10-14 13:58:51 +01:00
parent 2d2ec38541
commit 24532474a0
3 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/api/java/Context.java
View file

@ -30,10 +30,12 @@ public class Context extends IDisposable
* Constructor.
**/
public Context()
{
{
super();
m_ctx = Native.mkContextRc(0);
initContext();
synchronized (creation_lock) {
m_ctx = Native.mkContextRc(0);
initContext();
}
}
/**
@ -56,12 +58,14 @@ public class Context extends IDisposable
public Context(Map<String, String> settings)
{
super();
long cfg = Native.mkConfig();
for (Map.Entry<String, String> kv : settings.entrySet())
Native.setParamValue(cfg, kv.getKey(), kv.getValue());
m_ctx = Native.mkContextRc(cfg);
Native.delConfig(cfg);
initContext();
synchronized (creation_lock) {
long cfg = Native.mkConfig();
for (Map.Entry<String, String> kv : settings.entrySet())
Native.setParamValue(cfg, kv.getKey(), kv.getValue());
m_ctx = Native.mkContextRc(cfg);
Native.delConfig(cfg);
initContext();
}
}
/**
@ -3638,7 +3642,8 @@ public class Context extends IDisposable
Native.updateParamValue(nCtx(), id, value);
}
long m_ctx = 0;
protected long m_ctx = 0;
protected static Object creation_lock = new Object();
long nCtx()
{