Author: Armin Rigo <[email protected]>
Branch: extradoc
Changeset: r4251:557a565aaff5
Date: 2012-07-02 09:50 +0200
http://bitbucket.org/pypy/extradoc/changeset/557a565aaff5/
Log: Update
diff --git a/talk/ep2012/stm/STM-conflict.fig b/talk/ep2012/stm/STM-conflict.fig
--- a/talk/ep2012/stm/STM-conflict.fig
+++ b/talk/ep2012/stm/STM-conflict.fig
@@ -9,9 +9,6 @@
1200 2
2 2 0 1 0 9 50 -1 20 0.000 0 0 7 0 0 5
1125 1350 2475 1350 2475 1800 1125 1800 1125 1350
-2 1 0 1 0 4 51 -1 20 0.000 0 0 7 1 0 2
- 0 0 1.00 60.00 120.00
- 1125 2025 7425 2025
2 2 0 1 0 4 50 -1 20 0.000 0 0 -1 0 0 5
1125 1800 2250 1800 2250 2250 1125 2250 1125 1800
2 1 0 1 0 4 51 -1 20 0.000 0 0 7 1 0 2
@@ -22,8 +19,11 @@
2 2 0 1 0 9 50 -1 20 0.000 0 0 -1 0 0 5
2700 1350 4275 1350 4275 1800 2700 1800 2700 1350
2 2 0 1 0 4 50 -1 20 0.000 0 0 -1 0 0 5
+ 4500 1800 5625 1800 5625 2250 4500 2250 4500 1800
+2 1 0 1 0 4 51 -1 20 0.000 0 0 7 1 0 2
+ 0 0 1.00 60.00 120.00
+ 1125 2025 7425 2025
+2 2 0 1 0 4 50 -1 20 0.000 0 0 -1 0 0 5
+ 3375 1800 4275 1800 4275 2250 3375 2250 3375 1800
+2 2 0 1 0 27 50 -1 10 0.000 0 0 7 0 0 5
2475 1800 3375 1800 3375 2250 2475 2250 2475 1800
-2 2 0 1 0 4 50 -1 24 0.000 0 0 -1 0 0 5
- 3375 1800 4275 1800 4275 2250 3375 2250 3375 1800
-2 2 0 1 0 4 50 -1 20 0.000 0 0 -1 0 0 5
- 4500 1800 5625 1800 5625 2250 4500 2250 4500 1800
diff --git a/talk/ep2012/stm/talk.rst b/talk/ep2012/stm/talk.rst
--- a/talk/ep2012/stm/talk.rst
+++ b/talk/ep2012/stm/talk.rst
@@ -349,16 +349,30 @@
*Transactions,* similar to database transactions
-.. figure with the GIL
+* GIL
-.. figure with STM
+.. image:: GIL.png
+ :scale: 70%
+ :align: center
+
+* STM
+
+.. image:: STM.png
+ :scale: 70%
+ :align: center
Conflicts
---------
Occasional conflict:
-.. figure
+.. raw:: latex
+
+ \vspace{1cm}
+
+.. image:: STM-conflict.png
+ :scale: 70%
+ :align: center
HTM
---
@@ -403,9 +417,17 @@
* Longer, controlled transactions
-.. figure with the GIL
+* GIL
-.. figure with STM
+.. image:: bigGIL.png
+ :scale: 70%
+ :align: center
+
+* STM
+
+.. image:: bigSTM.png
+ :scale: 70%
+ :align: center
Results
-------
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
