From 07cdf0364c727da9fe7f9d1c684d7b07f6cf5151 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Sat, 29 Nov 2014 22:51:13 +0100
Subject: [PATCH] Data race: ProgressEmitter (debug output only)

---
 internal/model/progressemitter.go |  2 +-
 test/h2/config.xml                | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/internal/model/progressemitter.go b/internal/model/progressemitter.go
index 9adaf7ea0..b1d4bbca9 100755
--- a/internal/model/progressemitter.go
+++ b/internal/model/progressemitter.go
@@ -46,11 +46,11 @@ func (t *ProgressEmitter) Serve() {
 			}
 			return
 		case <-t.timer.C:
+			t.mut.Lock()
 			if debug {
 				l.Debugln("progress emitter: timer - looking after", len(t.registry))
 			}
 			output := make(map[string]map[string]*pullerProgress)
-			t.mut.Lock()
 			for _, puller := range t.registry {
 				if output[puller.folder] == nil {
 					output[puller.folder] = make(map[string]*pullerProgress)
diff --git a/test/h2/config.xml b/test/h2/config.xml
index 4e4fcfe70..164fd1bdc 100644
--- a/test/h2/config.xml
+++ b/test/h2/config.xml
@@ -102,18 +102,27 @@
         <device id="7TVCUYX-MLZH6GF-GDLVMJ6-REPXXUD-DCLPXP2-67HS7VR-QTTABOA-4ZXJOQD"></device>
         <versioning></versioning>
         <lenientMtimes>false</lenientMtimes>
+        <copiers>1</copiers>
+        <pullers>16</pullers>
+        <finishers>1</finishers>
     </folder>
     <folder id="s12" path="s12-2" ro="false" rescanIntervalS="15" ignorePerms="false">
         <device id="I6KAH76-66SLLLB-5PFXSOA-UFJCDZC-YAOMLEK-CP2GB32-BV5RQST-3PSROAU"></device>
         <device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
         <versioning></versioning>
         <lenientMtimes>false</lenientMtimes>
+        <copiers>1</copiers>
+        <pullers>16</pullers>
+        <finishers>1</finishers>
     </folder>
     <folder id="s23" path="s23-2" ro="false" rescanIntervalS="15" ignorePerms="false">
         <device id="JMFJCXB-GZDE4BN-OCJE3VF-65GYZNU-AIVJRET-3J6HMRQ-AUQIGJO-FKNHMQU"></device>
         <device id="373HSRP-QLPNLIE-JYKZVQF-P4PKZ63-R2ZE6K3-YD442U2-JHBGBQG-WWXAHAU"></device>
         <versioning></versioning>
         <lenientMtimes>false</lenientMtimes>
+        <copiers>1</copiers>
+        <pullers>16</pullers>
+        <finishers>1</finishers>
     </folder>
     <device id="AF2HXQA-DOKKIMI-PKOG4RE-E25UTJ7-PSGQ7T5-WEY7YT5-SG6N7W5-NNA4BQM" compression="false" introducer="false">
         <address>dynamic</address>
@@ -434,9 +443,11 @@
         <upnpLeaseMinutes>0</upnpLeaseMinutes>
         <upnpRenewalMinutes>30</upnpRenewalMinutes>
         <urAccepted>-1</urAccepted>
+        <urUniqueID></urUniqueID>
         <restartOnWakeup>true</restartOnWakeup>
         <autoUpgradeIntervalH>12</autoUpgradeIntervalH>
         <keepTemporariesH>24</keepTemporariesH>
         <cacheIgnoredFiles>true</cacheIgnoredFiles>
+        <progressUpdateIntervalS>5</progressUpdateIntervalS>
     </options>
 </configuration>