Skip to content

Commit 85553df

Browse files
MazinSharafMazinSharaf
authored
Merge branch 'main' into wasi-fix
2 parents f6aa483 + 4f5e798 commit 85553df

File tree

24 files changed

+811
-786
lines changed

24 files changed

+811
-786
lines changed

‎Doc/tutorial/datastructures.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,9 @@ Curly braces or the :func:`set` function can be used to create sets. Note: to
493493
create an empty set you have to use ``set()``, not ``{}``; the latter creates an
494494
empty dictionary, a data structure that we discuss in the next section.
495495

496+
Because sets are unordered, iterating over them or printing them can
497+
produce the elements in a different order than you expect.
498+
496499
Here is a brief demonstration::
497500

498501
>>> basket = {'apple', 'orange', 'apple', 'pear', 'orange', 'banana'}

‎Lib/profiling/sampling/_flamegraph_assets/flamegraph_template.html‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,51 @@ <h3 class="section-title">Profile Summary</h3>
178178
</div>
179179
</section>
180180

181+
<!-- Hotspots Section -->
182+
<section class="sidebar-section collapsible" id="hotspots-section">
183+
<button class="section-header" onclick="toggleSection('hotspots-section')">
184+
<h3 class="section-title">Hotspots</h3>
185+
<svg class="section-chevron" width="12" height="12" viewBox="0 0 12 12" fill="none">
186+
<path d="M3 4.5L6 7.5L9 4.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
187+
</svg>
188+
</button>
189+
<div class="section-content">
190+
<div class="hotspot" id="hotspot-1">
191+
<div class="hotspot-rank hotspot-rank--1">1</div>
192+
<div class="hotspot-info">
193+
<div class="hotspot-func" id="hotspot-func-1">--</div>
194+
<div class="hotspot-file" id="hotspot-file-1">--</div>
195+
<div class="hotspot-stats">
196+
<span class="hotspot-percent" id="hotspot-percent-1">--</span>
197+
<span id="hotspot-samples-1"></span>
198+
</div>
199+
</div>
200+
</div>
201+
<div class="hotspot" id="hotspot-2">
202+
<div class="hotspot-rank hotspot-rank--2">2</div>
203+
<div class="hotspot-info">
204+
<div class="hotspot-func" id="hotspot-func-2">--</div>
205+
<div class="hotspot-file" id="hotspot-file-2">--</div>
206+
<div class="hotspot-stats">
207+
<span class="hotspot-percent" id="hotspot-percent-2">--</span>
208+
<span id="hotspot-samples-2"></span>
209+
</div>
210+
</div>
211+
</div>
212+
<div class="hotspot" id="hotspot-3">
213+
<div class="hotspot-rank hotspot-rank--3">3</div>
214+
<div class="hotspot-info">
215+
<div class="hotspot-func" id="hotspot-func-3">--</div>
216+
<div class="hotspot-file" id="hotspot-file-3">--</div>
217+
<div class="hotspot-stats">
218+
<span class="hotspot-percent" id="hotspot-percent-3">--</span>
219+
<span id="hotspot-samples-3"></span>
220+
</div>
221+
</div>
222+
</div>
223+
</div>
224+
</section>
225+
181226
<!-- Thread Stats Section (GIL/GC) -->
182227
<section class="sidebar-section thread-stats-section collapsible" id="thread-stats-bar" style="display: none;">
183228
<button class="section-header" onclick="toggleSection('thread-stats-bar')">
@@ -237,51 +282,6 @@ <h3 class="section-title">Runtime Stats</h3>
237282
</div>
238283
</section>
239284

240-
<!-- Hotspots Section -->
241-
<section class="sidebar-section collapsible" id="hotspots-section">
242-
<button class="section-header" onclick="toggleSection('hotspots-section')">
243-
<h3 class="section-title">Hotspots</h3>
244-
<svg class="section-chevron" width="12" height="12" viewBox="0 0 12 12" fill="none">
245-
<path d="M3 4.5L6 7.5L9 4.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
246-
</svg>
247-
</button>
248-
<div class="section-content">
249-
<div class="hotspot" id="hotspot-1">
250-
<div class="hotspot-rank hotspot-rank--1">1</div>
251-
<div class="hotspot-info">
252-
<div class="hotspot-func" id="hotspot-func-1">--</div>
253-
<div class="hotspot-file" id="hotspot-file-1">--</div>
254-
<div class="hotspot-stats">
255-
<span class="hotspot-percent" id="hotspot-percent-1">--</span>
256-
<span id="hotspot-samples-1"></span>
257-
</div>
258-
</div>
259-
</div>
260-
<div class="hotspot" id="hotspot-2">
261-
<div class="hotspot-rank hotspot-rank--2">2</div>
262-
<div class="hotspot-info">
263-
<div class="hotspot-func" id="hotspot-func-2">--</div>
264-
<div class="hotspot-file" id="hotspot-file-2">--</div>
265-
<div class="hotspot-stats">
266-
<span class="hotspot-percent" id="hotspot-percent-2">--</span>
267-
<span id="hotspot-samples-2"></span>
268-
</div>
269-
</div>
270-
</div>
271-
<div class="hotspot" id="hotspot-3">
272-
<div class="hotspot-rank hotspot-rank--3">3</div>
273-
<div class="hotspot-info">
274-
<div class="hotspot-func" id="hotspot-func-3">--</div>
275-
<div class="hotspot-file" id="hotspot-file-3">--</div>
276-
<div class="hotspot-stats">
277-
<span class="hotspot-percent" id="hotspot-percent-3">--</span>
278-
<span id="hotspot-samples-3"></span>
279-
</div>
280-
</div>
281-
</div>
282-
</div>
283-
</section>
284-
285285
<!-- Thread Filter Section -->
286286
<section class="sidebar-section filter-section" id="thread-section" style="display: none;">
287287
<label class="filter-label" for="thread-filter">Thread Filter</label>

‎Makefile.pre.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
11031103

11041104
# wasm32-emscripten browser web example
11051105

1106-
EMSCRIPTEN_DIR=$(srcdir)/Tools/wasm/emscripten
1106+
EMSCRIPTEN_DIR=$(srcdir)/Platforms/emscripten
11071107
WEBEX_DIR=$(EMSCRIPTEN_DIR)/web_example/
11081108

11091109
ZIP_STDLIB=python$(VERSION)$(ABI_THREAD).zip
@@ -3174,7 +3174,7 @@ Python/emscripten_trampoline_inner.wasm: $(srcdir)/Python/emscripten_trampoline_
31743174
$$(dirname $$(dirname $(CC)))/bin/clang -o $@ $< -mgc -O2 -Wl,--no-entry -Wl,--import-table -Wl,--import-memory -target wasm32-unknown-unknown -nostdlib
31753175

31763176
Python/emscripten_trampoline_wasm.c: Python/emscripten_trampoline_inner.wasm
3177-
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/wasm/emscripten/prepare_external_wasm.py $< $@ getWasmTrampolineModule
3177+
$(PYTHON_FOR_REGEN) $(srcdir)/Platforms/emscripten/prepare_external_wasm.py $< $@ getWasmTrampolineModule
31783178

31793179
JIT_DEPS = \
31803180
$(srcdir)/Tools/jit/*.c \

Tools/wasm/README.md renamed to Platforms/emscripten/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ After building, you can run the full test suite with:
3535
```
3636
You can run the browser smoke test with:
3737
```shell
38-
./Tools/wasm/emscripten/browser_test/run_test.sh
38+
./Platforms/emscripten/browser_test/run_test.sh
3939
```
4040

4141
### The Web Example

0 commit comments

Comments
 (0)