diff options
Diffstat (limited to 'sort.go')
| -rw-r--r-- | sort.go | 63 |
1 files changed, 49 insertions, 14 deletions
@@ -153,8 +153,13 @@ func iterSortAll(w io.Writer, names map[string]string) { fmt.Fprintln(w, "}") fmt.Fprintln(w, "") fmt.Fprintln(w, "func (all *"+names["Bases"]+") Len() int {") - fmt.Fprintln(w, " "+names["lock"]+".RLock()") - fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") fmt.Fprintln(w, " return len(all."+names["Bases"]+")") fmt.Fprintln(w, "}") @@ -183,8 +188,13 @@ func iterSortBy(w io.Writer, names map[string]string) { func iterEnd(w io.Writer, names map[string]string) { fmt.Fprintln(w, "// safely returns a slice of pointers to the "+names["Base"]+" protobufs") fmt.Fprintln(w, "func (all *"+names["Bases"]+") selectAll"+names["Base"]+"() []*"+names["Base"]+" {") - fmt.Fprintln(w, " "+names["lock"]+".RLock()") - fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") fmt.Fprintln(w, " // Create a new slice to hold pointers to each "+names["Base"]+"") fmt.Fprintln(w, " var aStuff []*"+names["Base"]+"") @@ -209,8 +219,13 @@ func iterAppend(w io.Writer, names map[string]string) { // fmt.Fprintln(w, "func (all *"+names["Bases"]+") Append(newP *"+names["Base"]+") bool { // todo: make unique name here") fmt.Fprintln(w, "func (all *"+names["Bases"]+") AppendUnique"+names["append"]+"(newP *"+names["Base"]+") bool {") } - fmt.Fprintln(w, " "+names["lock"]+".Lock()") - fmt.Fprintln(w, " defer "+names["lock"]+".Unlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") if names["append"] != "" { fmt.Fprintln(w, " for _, p := range all."+names["Bases"]+" {") @@ -233,8 +248,13 @@ func iterReplace(w io.Writer, names map[string]string) { fmt.Fprintln(w, "// enforces "+names["append"]+" is unique") fmt.Fprintln(w, "func (all *"+names["Bases"]+") Replace"+names["append"]+"(newP *"+names["Base"]+") bool { // todo: make unique name here") - fmt.Fprintln(w, " "+names["lock"]+".Lock()") - fmt.Fprintln(w, " defer "+names["lock"]+".Unlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") fmt.Fprintln(w, " for _, p := range all."+names["Bases"]+" {") fmt.Fprintln(w, " if p."+names["append"]+" == newP."+names["append"]+" {") @@ -250,8 +270,13 @@ func iterReplace(w io.Writer, names map[string]string) { func iterDelete(w io.Writer, names map[string]string) { fmt.Fprintln(w, "func (all *"+names["Bases"]+") DeleteBy"+names["append"]+"(s string) bool {") - fmt.Fprintln(w, " "+names["lock"]+".Lock()") - fmt.Fprintln(w, " defer "+names["lock"]+".Unlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") fmt.Fprintln(w, " for i, _ := range all."+names["Bases"]+" {") fmt.Fprintln(w, " if all."+names["Bases"]+"[i]."+names["append"]+" == s {") @@ -268,8 +293,13 @@ func iterDelete(w io.Writer, names map[string]string) { // this tries to return the deleted one but is wrong/gives warning if mutex lock is in struct func iterDeleteWithCopy(w io.Writer, names map[string]string) { fmt.Fprintln(w, "func (all *"+names["Bases"]+") DeleteBy"+names["append"]+"(s string) *"+names["Base"]+" {") - fmt.Fprintln(w, " "+names["lock"]+".Lock()") - fmt.Fprintln(w, " defer "+names["lock"]+".Unlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") fmt.Fprintln(w, " var newr "+names["Base"]) fmt.Fprintln(w, "") @@ -289,8 +319,13 @@ func iterDeleteWithCopy(w io.Writer, names map[string]string) { func iterFind(w io.Writer, names map[string]string) { fmt.Fprintln(w, "// find a dependancy by the go path") fmt.Fprintln(w, "func (all *"+names["Bases"]+") FindBy"+names["append"]+"(s string) *"+names["Base"]+" {") - fmt.Fprintln(w, " "+names["lock"]+".Lock()") - fmt.Fprintln(w, " defer "+names["lock"]+".Unlock()") + if sortmap["lock"] == "all" { + fmt.Fprintln(w, " "+names["lock"]+".Lock.RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".Lock.RUnlock()") + } else { + fmt.Fprintln(w, " "+names["lock"]+".RLock()") + fmt.Fprintln(w, " defer "+names["lock"]+".RUnlock()") + } fmt.Fprintln(w, "") fmt.Fprintln(w, " for i, _ := range all."+names["Bases"]+" {") fmt.Fprintln(w, " if all."+names["Bases"]+"[i]."+names["append"]+" == s {") |