Removed testing code for dynamic upload mem buff

file_system.go

@@ -27,7 +27,6 @@ import (
 	fsp "imuslab.com/arozos/mod/filesystem/fspermission"
 	hidden "imuslab.com/arozos/mod/filesystem/hidden"
 	metadata "imuslab.com/arozos/mod/filesystem/metadata"
-	usage "imuslab.com/arozos/mod/info/usageinfo"
 	module "imuslab.com/arozos/mod/modules"
 	prout "imuslab.com/arozos/mod/prouter"
 	"imuslab.com/arozos/mod/share"
@@ -38,8 +37,6 @@ import (
 var (
 	thumbRenderHandler *metadata.RenderHandler
 	shareManager       *share.Manager
-
-	systemReservedUploadMem int64 = 0
 )
 
 type trashedFile struct {
@@ -527,26 +524,7 @@ func system_fs_handleUpload(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	//Experimental code: Get the remaining memory and use 1/2 - 10MB of it
-	//See https://golang.org/pkg/mime/multipart/#Reader.ReadForm for why 10MB
-	usedRam, totalRam := usage.GetNumericRAMUsage()
-	autoCalculatedUploadBuf := int64(0)
-	if usedRam > 0 && totalRam > 0 {
-		//Use *upload_buf per 1GB rules for upload
-		usableMemorySpace := totalRam - usedRam - systemReservedUploadMem
-		autoCalculatedUploadBuf := int64((float64(usableMemorySpace) / float64(1024*1024*1024)) * float64(*upload_buf))
-
-		//Add the reserve to global reserve memory value
-		systemReservedUploadMem += autoCalculatedUploadBuf
-
-		//Handle file upload
-		log.Println("*Testing* Upload buffer set to ", autoCalculatedUploadBuf, "MB")
-		err = r.ParseMultipartForm(int64(autoCalculatedUploadBuf) << 20)
-	} else {
-		//Unable to get RAM usage. Use default parser buffer size
-		err = r.ParseMultipartForm(int64(*upload_buf) << 20)
-	}
-
+	err = r.ParseMultipartForm(int64(*upload_buf) << 20)
 	if err != nil {
 		//Filesize too big
 		log.Println(err)
@@ -641,9 +619,6 @@ func system_fs_handleUpload(w http.ResponseWriter, r *http.Request) {
 			//Perform a GC afterward
 			runtime.GC()
 
-			//Deduce the buffered memory
-			systemReservedUploadMem -= autoCalculatedUploadBuf
-
 		}(r, file, destination, userinfo)
 	} else {
 		//Use blocking upload and move method
@@ -685,9 +660,6 @@ func system_fs_handleUpload(w http.ResponseWriter, r *http.Request) {
 	//Perform a GC
 	runtime.GC()
 
-	//Deduce the buffered memory
-	systemReservedUploadMem -= autoCalculatedUploadBuf
-
 	//Completed
 	sendOK(w)