refactor(archive): replaced channels with atomic int

Author: OlegChuev-MD

src/goNixArgParser/parseResult.go

@@ -118,6 +118,17 @@ func (r *ParseResult) GetInt(key string) (value int, found bool) {
 	return
 }
 
+func (r *ParseResult) GetInt32(key string) (value int32, found bool) {
+	str, found := r.GetString(key)
+	if !found {
+		return
+	}
+
+	value, err := toInt32(str)
+	found = err == nil
+	return
+}
+
 func (r *ParseResult) GetInt64(key string) (value int64, found bool) {
 	str, found := r.GetString(key)
 	if !found {

src/goNixArgParser/util.go

@@ -81,6 +81,11 @@ func toInts(input []string) ([]int, error) {
 	return output, nil
 }
 
+func toInt32(input string) (int32, error) {
+	v, err := strconv.ParseInt(input, 10, 32)
+	return int32(v), err
+}
+
 func toInt64(input string) (int64, error) {
 	return strconv.ParseInt(input, 10, 64)
 }

src/param/cli.go

@@ -440,7 +440,7 @@ func CmdResultsToParams(results []*goNixArgParser.ParseResult) (params Params, e
 		archiveDirsUsers, _ := result.GetStrings("archivedirsusers")
 		param.ArchiveDirsUsers = SplitAllKeyValues(archiveDirsUsers)
 
-		param.ArchiveMaxWorkers, _ = result.GetInt("archivemaxworkers")
+		param.ArchiveMaxWorkers, _ = result.GetInt32("archivemaxworkers")
 
 		// global restrict access
 		if result.HasKey("globalrestrictaccess") {

src/param/main.go

@@ -62,8 +62,7 @@ type Param struct {
 	ArchiveUrlsUsers  [][]string // [][path, user...]
 	ArchiveDirs       []string
 	ArchiveDirsUsers  [][]string // [][path, user...]
-	ArchiveMaxWorkers int
-	ArchivationsSem   chan struct{}
+	ArchiveMaxWorkers int32
 
 	GlobalCors bool
 	CorsUrls   []string
@@ -166,9 +165,6 @@ func (param *Param) Normalize() (errs []error) {
 	param.DeleteDirs = NormalizeFsPaths(param.DeleteDirs)
 	param.ArchiveUrls = NormalizeUrlPaths(param.ArchiveUrls)
 	param.ArchiveDirs = NormalizeFsPaths(param.ArchiveDirs)
-	if param.ArchiveMaxWorkers > 0 {
-		param.ArchivationsSem = make(chan struct{}, param.ArchiveMaxWorkers)
-	}
 
 	param.CorsUrls = NormalizeUrlPaths(param.CorsUrls)
 	param.CorsDirs = NormalizeFsPaths(param.CorsDirs)

src/serverHandler/aliasHandler.go

@@ -5,6 +5,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"sync/atomic"
 
 	"mjpclab.dev/ghfs/src/middleware"
 	"mjpclab.dev/ghfs/src/param"
@@ -49,7 +50,8 @@ type aliasHandler struct {
 	archive *hierarchyAvailability
 	cors    *hierarchyAvailability
 
-	archiveWorkers chan struct{}
+	archiveMaxWorkers int32
+	archiveWorkers    *int32
 
 	globalRestrictAccess []string
 	restrictAccessUrls   pathStringsList
@@ -143,11 +145,11 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *aliasHandler) createArchive(w http.ResponseWriter, r *http.Request, session *sessionContext, data *responseData) bool {
-	if h.archiveWorkers != nil {
-		select {
-		case h.archiveWorkers <- struct{}{}:
-			defer func() { <-h.archiveWorkers }()
-		default:
+	if h.archiveMaxWorkers > 0 {
+		current := atomic.AddInt32(h.archiveWorkers, -1)
+		defer atomic.AddInt32(h.archiveWorkers, 1)
+
+		if current < 0 {
 			data.Status = http.StatusTooManyRequests
 			return false
 		}
@@ -192,7 +194,8 @@ func newAliasHandler(
 		toHttpsPort:  p.ToHttpsPort,
 		defaultSort:  p.DefaultSort,
 
-		archiveWorkers: p.ArchivationsSem,
+		archiveMaxWorkers: vhostCtx.archiveMaxWorkers,
+		archiveWorkers:    vhostCtx.archiveWorkers,
 
 		users:  vhostCtx.users,
 		theme:  vhostCtx.theme,

src/serverHandler/vhostHandler.go

@@ -1,14 +1,15 @@
 package serverHandler
 
 import (
+	"net/http"
+	"regexp"
+
 	"mjpclab.dev/ghfs/src/param"
 	"mjpclab.dev/ghfs/src/serverError"
 	"mjpclab.dev/ghfs/src/serverLog"
 	"mjpclab.dev/ghfs/src/tpl/defaultTheme"
 	"mjpclab.dev/ghfs/src/tpl/theme"
 	"mjpclab.dev/ghfs/src/user"
-	"net/http"
-	"regexp"
 )
 
 type vhostContext struct {
@@ -29,6 +30,9 @@ type vhostContext struct {
 	archiveUrlsUsers pathIntsList
 	archiveDirsUsers pathIntsList
 
+	archiveMaxWorkers int32
+	archiveWorkers    *int32
+
 	shows     *regexp.Regexp
 	showDirs  *regexp.Regexp
 	showFiles *regexp.Regexp
@@ -95,6 +99,11 @@ func NewVhostHandler(
 		theme = defaultTheme.DefaultTheme
 	}
 
+	var archiveMaxWorkers int32
+	if p.ArchiveMaxWorkers > 0 {
+		archiveMaxWorkers = p.ArchiveMaxWorkers
+	}
+
 	// alias param
 	vhostCtx := &vhostContext{
 		logger: logger,
@@ -114,6 +123,9 @@ func NewVhostHandler(
 		archiveUrlsUsers: pathUsernamesToPathUids(users, p.ArchiveUrlsUsers),
 		archiveDirsUsers: pathUsernamesToPathUids(users, p.ArchiveDirsUsers),
 
+		archiveMaxWorkers: p.ArchiveMaxWorkers,
+		archiveWorkers:    &archiveMaxWorkers,
+
 		shows:     shows,
 		showDirs:  showDirs,
 		showFiles: showFiles,