diff options
| author | Jeff Carr <[email protected]> | 2025-01-19 02:37:58 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-01-19 02:37:58 -0600 |
| commit | b0595d6a1d7747bfe10b18be7d2c93c8f120f678 (patch) | |
| tree | 72d30b115389c6f6f54b4f6495034424a23e0a4a | |
| parent | 84c9fe2bfcb7937246b21e4aff2984ae2fe18e95 (diff) | |
remove every mutex change since Marshal() was crashing
| -rw-r--r-- | repo.new.go | 9 | ||||
| -rw-r--r-- | repo.proto | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/repo.new.go b/repo.new.go index 39dd303..27b21f9 100644 --- a/repo.new.go +++ b/repo.new.go @@ -50,15 +50,18 @@ func (all *Repos) NewGoRepo(fullpath string, gopath string) (*Repo, error) { // enforces GoPath is unique func (all *Repos) AppendByGoPath(newr *Repo) bool { - all.RLock() + // all.RLock() + repoMu.RLock() for _, r := range all.Repos { if r.GoInfo.GoPath == newr.GoInfo.GoPath { - all.RUnlock() + // all.RUnlock() + repoMu.RUnlock() return false } } - all.RUnlock() + // all.RUnlock() + repoMu.RUnlock() // all.Repos = append(all.Repos, newr) all.Append(newr) @@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto"; // Import the well-known type for Time // global settings for autogenpb `autogenpb:mutex` -message Repo { // `autogenpb:marshal` `autogenpb:2nomutex` +message Repo { // `autogenpb:marshal` `autogenpb:nomutex` string fullPath = 1; // `autogenpb:unique` `autogenpb:sort` // the actual path to the .git directory: '/home/devel/golang.org/x/tools' string masterBranchName = 3; // git 'main' or 'master' branch name string develBranchName = 4; // whatever the git 'devel' branch name is @@ -38,14 +38,14 @@ message Repo { // `autogenpb:marshal` `autogenpb:2nomutex` GitConfig gitConfig = 25; // protobuf of the current .git/config } -message Repos { // `autogenpb:marshal` `autogenpb:sort` `autogenpb:2nomutex` +message Repos { // `autogenpb:marshal` `autogenpb:sort` `autogenpb:nomutex` string uuid = 1; // `autogenpb:uuid:8daaeba1-fb1f-4762-ae6e-95a55d352673` string version = 2; // `autogenpb:version:2` repeated Repo repos = 3; // `autogenpb:append` // generate AppendUnique() function for this } // should it be done this way? -message GitTimes { // `autogenpb:2nomutex` +message GitTimes { // `autogenpb:nomutex` google.protobuf.Timestamp lastPull = 1; // last time a git pull was done google.protobuf.Timestamp lastUpdate = 2; // when was ReloadGit() last done google.protobuf.Timestamp lastDirty = 3; // last time CheckDirty() was run @@ -59,7 +59,7 @@ message GitTimes { // `autogenpb:2nomutex` } // this is probably better. think about moving to this instead -message GoInfo { // `autogenpb:2nomutex` +message GoInfo { // `autogenpb:nomutex` string goPath = 1; // the logical path as used by golang: 'go.wit.com/apps/helloworld' string desc = 2; // what is this repo? bool goLibrary = 3; // is this a golang library? |