diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 9 | ||||
-rwxr-xr-x | tools/run_tests/jobset.py | 2 | ||||
-rwxr-xr-x | tools/run_tests/port_server.py | 11 | ||||
-rw-r--r-- | tools/run_tests/sources_and_headers.json | 56 | ||||
-rw-r--r-- | tools/run_tests/tests.json | 38 |
5 files changed, 79 insertions, 37 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 8b88d54331..75e6f5119f 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -815,8 +815,10 @@ src/core/httpcli/parser.h \ src/core/iomgr/alarm.h \ src/core/iomgr/alarm_heap.h \ src/core/iomgr/alarm_internal.h \ +src/core/iomgr/closure.h \ src/core/iomgr/endpoint.h \ src/core/iomgr/endpoint_pair.h \ +src/core/iomgr/exec_ctx.h \ src/core/iomgr/fd_posix.h \ src/core/iomgr/iocp_windows.h \ src/core/iomgr/iomgr.h \ @@ -843,6 +845,9 @@ src/core/iomgr/time_averaged_stats.h \ src/core/iomgr/udp_server.h \ src/core/iomgr/wakeup_fd_pipe.h \ src/core/iomgr/wakeup_fd_posix.h \ +src/core/iomgr/workqueue.h \ +src/core/iomgr/workqueue_posix.h \ +src/core/iomgr/workqueue_windows.h \ src/core/json/json.h \ src/core/json/json_common.h \ src/core/json/json_reader.h \ @@ -943,9 +948,11 @@ src/core/httpcli/httpcli.c \ src/core/httpcli/parser.c \ src/core/iomgr/alarm.c \ src/core/iomgr/alarm_heap.c \ +src/core/iomgr/closure.c \ src/core/iomgr/endpoint.c \ src/core/iomgr/endpoint_pair_posix.c \ src/core/iomgr/endpoint_pair_windows.c \ +src/core/iomgr/exec_ctx.c \ src/core/iomgr/fd_posix.c \ src/core/iomgr/iocp_windows.c \ src/core/iomgr/iomgr.c \ @@ -976,6 +983,8 @@ src/core/iomgr/wakeup_fd_eventfd.c \ src/core/iomgr/wakeup_fd_nospecial.c \ src/core/iomgr/wakeup_fd_pipe.c \ src/core/iomgr/wakeup_fd_posix.c \ +src/core/iomgr/workqueue_posix.c \ +src/core/iomgr/workqueue_windows.c \ src/core/json/json.c \ src/core/json/json_reader.c \ src/core/json/json_string.c \ diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 2a86319125..c0b9c02b3e 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -174,6 +174,7 @@ class Job(object): for k, v in add_env.iteritems(): env[k] = v self._start = time.time() + message('START', spec.shortname, do_newline=travis) self._process = subprocess.Popen(args=spec.cmdline, stderr=subprocess.STDOUT, stdout=self._tempfile, @@ -185,7 +186,6 @@ class Job(object): self._travis = travis self._xml_test = ET.SubElement(xml_report, 'testcase', name=self._spec.shortname) if xml_report is not None else None - message('START', spec.shortname, do_newline=self._travis) def state(self, update_cache): """Poll current state of the job. Prints messages at completion.""" diff --git a/tools/run_tests/port_server.py b/tools/run_tests/port_server.py index da76230ad5..48b6214b95 100755 --- a/tools/run_tests/port_server.py +++ b/tools/run_tests/port_server.py @@ -51,7 +51,7 @@ with open(__file__) as f: _MY_VERSION = hashlib.sha1(f.read()).hexdigest() -def refill_pool(max_timeout): +def refill_pool(max_timeout, req): """Scan for ports not marked for being in use""" for i in range(1025, 32767): if len(pool) > 100: break @@ -59,11 +59,13 @@ def refill_pool(max_timeout): age = time.time() - in_use[i] if age < max_timeout: continue + req.log_message("kill old request %d" % i) del in_use[i] s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) try: s.bind(('localhost', i)) + req.log_message("found available port %d" % i) pool.append(i) except: pass # we really don't care about failures @@ -71,13 +73,14 @@ def refill_pool(max_timeout): s.close() -def allocate_port(): +def allocate_port(req): global pool global in_use max_timeout = 600 while not pool: - refill_pool(max_timeout) + refill_pool(max_timeout, req) if not pool: + req.log_message("failed to find ports: retrying soon") time.sleep(1) max_timeout /= 2 port = pool[0] @@ -99,7 +102,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.send_header('Content-Type', 'text/plain') self.end_headers() - p = allocate_port() + p = allocate_port(self) self.log_message('allocated port %d' % p) self.wfile.write('%d' % p) elif self.path[0:6] == '/drop/': diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 3696e2d1d8..071d7943e4 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -38,20 +38,6 @@ ], "headers": [], "language": "c", - "name": "alarm_test", - "src": [ - "test/core/iomgr/alarm_test.c" - ] - }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", "name": "alpn_test", "src": [ "test/core/transport/chttp2/alpn_test.c" @@ -1057,6 +1043,20 @@ "gpr", "gpr_test_util", "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "workqueue_test", + "src": [ + "test/core/iomgr/workqueue_test.c" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", "grpc++", "grpc++_test_util", "grpc_test_util" @@ -12311,8 +12311,10 @@ "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", @@ -12339,6 +12341,9 @@ "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", @@ -12482,11 +12487,15 @@ "src/core/iomgr/alarm_heap.c", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.c", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.c", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.c", @@ -12543,6 +12552,11 @@ "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.c", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.c", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.c", "src/core/json/json.h", "src/core/json/json_common.h", @@ -12800,8 +12814,10 @@ "src/core/iomgr/alarm.h", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.h", "src/core/iomgr/iomgr.h", @@ -12828,6 +12844,9 @@ "src/core/iomgr/udp_server.h", "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.h", "src/core/json/json_common.h", "src/core/json/json_reader.h", @@ -12956,11 +12975,15 @@ "src/core/iomgr/alarm_heap.c", "src/core/iomgr/alarm_heap.h", "src/core/iomgr/alarm_internal.h", + "src/core/iomgr/closure.c", + "src/core/iomgr/closure.h", "src/core/iomgr/endpoint.c", "src/core/iomgr/endpoint.h", "src/core/iomgr/endpoint_pair.h", "src/core/iomgr/endpoint_pair_posix.c", "src/core/iomgr/endpoint_pair_windows.c", + "src/core/iomgr/exec_ctx.c", + "src/core/iomgr/exec_ctx.h", "src/core/iomgr/fd_posix.c", "src/core/iomgr/fd_posix.h", "src/core/iomgr/iocp_windows.c", @@ -13017,6 +13040,11 @@ "src/core/iomgr/wakeup_fd_pipe.h", "src/core/iomgr/wakeup_fd_posix.c", "src/core/iomgr/wakeup_fd_posix.h", + "src/core/iomgr/workqueue.h", + "src/core/iomgr/workqueue_posix.c", + "src/core/iomgr/workqueue_posix.h", + "src/core/iomgr/workqueue_windows.c", + "src/core/iomgr/workqueue_windows.h", "src/core/json/json.c", "src/core/json/json.h", "src/core/json/json_common.h", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index ebdd52f0af..7989f5c100 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -47,24 +47,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "alarm_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "alpn_test", "platforms": [ "linux", @@ -1169,6 +1151,8 @@ }, { "ci_platforms": [ + "linux", + "mac", "posix" ], "exclude_configs": [], @@ -1176,6 +1160,8 @@ "language": "c", "name": "udp_server_test", "platforms": [ + "linux", + "mac", "posix" ] }, @@ -1201,6 +1187,22 @@ "ci_platforms": [ "linux", "mac", + "posix" + ], + "exclude_configs": [], + "flaky": false, + "language": "c", + "name": "workqueue_test", + "platforms": [ + "linux", + "mac", + "posix" + ] + }, + { + "ci_platforms": [ + "linux", + "mac", "posix", "windows" ], |