mirror/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-26 15:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

scorecard: more upload options

Browse Source 
`--upload-no-cl` for uploads without "Content-Length:"
`--upload-parallel=1` for testing only serial uploads

Closes #20035
This commit is contained in:
Stefan Eissing 2025-12-19 13:06:34 +01:00 committed by Daniel Stenberg
parent 0f7b182f2f
commit 4ec7136010
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/http/scorecard.py
View File

@ -198,7 +198,8 @@ class ScoreRunner:
server_addr: Optional[str] = None,
with_flame: bool = False,
socks_args: Optional[List[str]] = None,
limit_rate: Optional[str] = None):
limit_rate: Optional[str] = None,
suppress_cl: bool = False):
self.verbose = verbose
self.env = env
self.protocol = protocol
@ -211,6 +212,7 @@ class ScoreRunner:
self._with_flame = with_flame
self._socks_args = socks_args
self._limit_rate = limit_rate
self.suppress_cl = suppress_cl
def info(self, msg):
if self.verbose > 0:
@ -419,7 +421,8 @@ class ScoreRunner:
for _ in range(nsamples):
curl = self.mk_curl_client()
r = curl.http_put(urls=[url], fdata=fpath, alpn_proto=self.protocol,
with_headers=False, with_profile=True)
with_headers=False, with_profile=True,
suppress_cl=self.suppress_cl)
err = self._check_uploads(r, 1)
if err:
errors.append(err)
@ -438,7 +441,8 @@ class ScoreRunner:
for _ in range(nsamples):
curl = self.mk_curl_client()
r = curl.http_put(urls=[url], fdata=fpath, alpn_proto=self.protocol,
with_headers=False, with_profile=True)
with_headers=False, with_profile=True,
suppress_cl=self.suppress_cl)
err = self._check_uploads(r, count)
if err:
errors.append(err)
@ -459,9 +463,10 @@ class ScoreRunner:
curl = self.mk_curl_client()
r = curl.http_put(urls=[url], fdata=fpath, alpn_proto=self.protocol,
with_headers=False, with_profile=True,
suppress_cl=self.suppress_cl,
extra_args=[
'--parallel',
'--parallel-max', str(max_parallel)
'--parallel-max', str(max_parallel),
])
err = self._check_uploads(r, count)
if err:
@ -476,11 +481,14 @@ class ScoreRunner:
nsamples = meta['samples']
max_parallel = self._upload_parallel if self._upload_parallel > 0 else count
cols = ['size']
if not self._upload_parallel:
run_single = not self._upload_parallel
run_serial = not self._upload_parallel and count > 1
run_parallel = self._upload_parallel or count > 1
if run_single:
cols.append('single')
if count > 1:
cols.append(f'serial({count})')
if count > 1:
if run_serial:
cols.append(f'serial({count})')
if run_parallel:
cols.append(f'parallel({count}x{max_parallel})')
rows = []
for fsize in fsizes:
@ -489,15 +497,15 @@ class ScoreRunner:
'sval': Card.fmt_size(fsize)
}]
self.info(f'{row[0]["sval"]} uploads...')
url = f'https://{self.env.domain2}:{self.server_port}/curltest/put'
url = f'https://{self.env.domain1}:{self.server_port}/curltest/put'
fname = f'upload{row[0]["sval"]}.data'
fpath = self._make_docs_file(docs_dir=self.env.gen_dir,
fname=fname, fsize=fsize)
if 'single' in cols:
if run_single:
row.append(self.ul_single(url=url, fpath=fpath, nsamples=nsamples))
if count > 1:
if 'single' in cols:
row.append(self.ul_serial(url=url, fpath=fpath, count=count, nsamples=nsamples))
if run_serial:
row.append(self.ul_serial(url=url, fpath=fpath, count=count, nsamples=nsamples))
if run_parallel:
row.append(self.ul_parallel(url=url, fpath=fpath, count=count, nsamples=nsamples))
rows.append(row)
self.info('done.\n')
@ -732,7 +740,8 @@ def run_score(args, protocol):
upload_parallel=args.upload_parallel,
with_flame=args.flame,
socks_args=socks_args,
limit_rate=args.limit_rate)
limit_rate=args.limit_rate,
suppress_cl=args.upload_no_cl)
cards.append(card)
if test_httpd:
@ -899,6 +908,8 @@ def main():
parser.add_argument("--upload-parallel", action='store', type=int,
metavar='number', default=0,
help="perform that many uploads in parallel (default all)")
parser.add_argument("--upload-no-cl", action='store_true',
default=False, help="suppress content-length on upload")
parser.add_argument("-r", "--requests", action='store_true',
default=False, help="evaluate requests")

6
tests/http/testenv/curl.py
View File

@ -784,6 +784,7 @@ class CurlClient:
with_stats: bool = True,
with_headers: bool = False,
with_profile: bool = False,
suppress_cl: bool = False,
extra_args: Optional[List[str]] = None):
if extra_args is None:
extra_args = []
@ -798,6 +799,11 @@ class CurlClient:
extra_args.extend([
'-w', '%{json}\\n'
])
if suppress_cl:
extra_args.extend([
'-H', 'Content-Length:',
'-H', 'Transfer-Encoding: chunked',
])
return self._raw(urls, intext=data,
alpn_proto=alpn_proto, options=extra_args,
with_stats=with_stats,