Syncing (schollz#106)

* Preparing cache for syncing

* Cacheing works for psCache

cache.go

@@ -6,9 +6,16 @@
 
 package main
 
-import "time"
+import (
+	"sync"
+	"time"
+)
+
+var psCache = struct {
+	sync.RWMutex
+	m map[string]FullParameters
+}{m: make(map[string]FullParameters)}
 
-var psCache map[string]FullParameters
 var usersCache map[string][]string
 var userPositionCache map[string]UserPositionJSON
 var isLearning map[string]bool
@@ -19,10 +26,29 @@ func init() {
 
 func clearCache() {
 	for {
+		Debug.Println("Resetting cache")
 		isLearning = make(map[string]bool)
-		psCache = make(map[string]FullParameters)
+		psCache.Lock()
+		psCache.m = make(map[string]FullParameters)
+		psCache.Unlock()
 		usersCache = make(map[string][]string)
 		userPositionCache = make(map[string]UserPositionJSON)
-		time.Sleep(time.Minute * 10)
+		time.Sleep(time.Second * 10)
 	}
 }
+
+func getPsCache(group string) (FullParameters, bool) {
+	Debug.Println("Getting pscache")
+	psCache.RLock()
+	psCached, ok := psCache.m[group]
+	psCache.RUnlock()
+	return psCached, ok
+}
+
+func setPsCache(group string, ps FullParameters) {
+	Debug.Println("Setting pscache")
+	psCache.Lock()
+	psCache.m[group] = ps
+	psCache.Unlock()
+	return
+}

parameters.go

@@ -131,8 +131,9 @@ func saveParameters(group string, res FullParameters) error {
 }
 
 func openParameters(group string) (FullParameters, error) {
-	if _, ok := psCache[group]; ok {
-		return psCache[group], nil
+	psCached, ok := getPsCache(group)
+	if ok {
+		return psCached, nil
 	}
 
 	var ps = *NewFullParameters()
@@ -152,7 +153,8 @@ func openParameters(group string) (FullParameters, error) {
 		ps = loadParameters(v)
 		return nil
 	})
-	psCache[group] = ps
+
+	setPsCache(group, ps)
 	return ps, err
 }
 

priors.go

@@ -112,7 +112,7 @@ func optimizePriors(group string) {
 	}
 
 	go saveParameters(group, ps)
-	psCache[group] = ps
+	go setPsCache(group, ps)
 }
 
 func regenerateEverything(group string) {

priorsThreaded.go

@@ -230,7 +230,7 @@ func optimizePriorsThreaded(group string) error {
 	usersCache = make(map[string][]string)
 	// Debug.Println(getUsers(group))
 	go saveParameters(group, ps)
-	psCache[group] = ps
+	go setPsCache(group, ps)
 
 	return nil
 }
@@ -369,6 +369,6 @@ func optimizePriorsThreadedNot(group string) {
 		crossValidation(group, n, &ps, fingerprintsInMemory, fingerprintsOrdering)
 	}
 	go saveParameters(group, ps)
-	psCache[group] = ps
+	go setPsCache(group, ps)
 	// Debug.Println("Analyzed ", totalJobs, " fingerprints")
 }