pystack 1.4.1__tar.gz → 1.5.1__tar.gz

{pystack-1.4.1 → pystack-1.5.1}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.4.1
+current_version = 1.5.1
 commit = True
 message = 
 	Prepare for {new_version} release

{pystack-1.4.1 → pystack-1.5.1}/MANIFEST.in

@@ -14,7 +14,6 @@ include README.md
 include src/pystack/py.typed
 include .bumpversion.cfg
 include .pre-commit-config.yaml
-include build_scripts/elfutils_contiguous_segments.diff
 
 recursive-include src/pystack/_pystack *
 recursive-include src/pystack *.py

{pystack-1.4.1 → pystack-1.5.1}/NEWS.rst

@@ -8,6 +8,44 @@ Changelog
 
 .. towncrier release notes start
 
+pystack 1.5.1 (2025-08-18)
+--------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+- Correct a bug in our GitHub Actions workflow that prevented artifacts for 1.5.0 from being uploaded to PyPI. No changes have been made to the PyStack code itself since 1.5.0 (#250)
+
+
+pystack 1.5.0 (2025-08-18)
+--------------------------
+
+Features
+~~~~~~~~
+
+- Add a new ``--native-last`` command line flag to only show the C frames after the last Python frame. (#182)
+- Add support for Python 3.14 (#229)
+- Support kernels that don't have CONFIG_CROSS_MEMORY_ATTACH set. (#240)
+
+
+Deprecations and Removals
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- We no longer provide x86-64 musllinux_1_1 wheels. The manylinux project dropped support for musllinux_1_1 on November 1st, 2024. (#237)
+- We no longer provide Python 3.7 wheels. Python 3.7 has been end-of-life since June 2023. (#237)
+
+
+Bug Fixes
+~~~~~~~~~
+
+- Fix incorrect file offset calculation when analyzing ELF files with
+  non-standard ELF layouts. Previously, pystack would fail to correctly analyze
+  Python binaries that had non-standard ELF layouts (for example when compiled
+  with certain linker options). The fix properly accounts for PT_LOAD segment
+  mappings when calculating file offsets. (#220)
+- Improve handling of core files where we cannot determine the executable. (#221)
+
+
 pystack 1.4.1 (2024-10-04)
 --------------------------
 

{pystack-1.4.1 → pystack-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pystack
-Version: 1.4.1
+Version: 1.5.1
 Summary: Analysis of the stack of remote python processes
 Home-page: https://github.com/bloomberg/pystack
 Author: Pablo Galindo Salgado
@@ -18,6 +18,14 @@ Classifier: Topic :: Software Development :: Debuggers
 Requires-Python: >=3.7.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 <p align="center">
 <img src="https://user-images.githubusercontent.com/11718525/226942590-de015c9a-4d5b-4960-9c42-8c1eac0845c1.png" width="70%">

{pystack-1.4.1 → pystack-1.5.1}/pyproject.toml

@@ -46,19 +46,18 @@ underlines = "-~"
 build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*"]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-i686-image = "manylinux2014"
-musllinux-x86_64-image = "musllinux_1_1"
+musllinux-x86_64-image = "musllinux_1_2"
 skip = "*-musllinux_aarch64"
 
 [tool.cibuildwheel.linux]
 before-all = [
-  "yum install -y python-devel-2.7.5",
+  "yum install -y libzstd-devel",
   "cd /",
-  "VERS=0.189",
+  "VERS=0.193",
   "curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
   "tar -xf elfutils.tar.bz2",
   "cd elfutils-$VERS",
-  "patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
-  "CFLAGS='-w' ./configure --enable-libdebuginfod=dummy --disable-debuginfod --prefix=/usr --libdir=/usr/lib64",
+  "CFLAGS='-Wno-error -g -O3' CXXFLAGS='-Wno-error -g -O3' ./configure --disable-nls --enable-libdebuginfod=dummy --disable-debuginfod --with-zstd",
   "make install"
 ]
 
@@ -70,34 +69,22 @@ before-all = [
   # dependency of elfutils.
   "apk del gettext-dev glib-dev",
 
-  # Build musl-fts from source. This is a build dependency of elfutils, but
-  # isn't in the Alpine repos of the musllinux_1_1 image. The build steps come
-  # from https://git.alpinelinux.org/aports/tree/main/musl-fts/APKBUILD
-  # Setting PATH before calling boostrap.sh fixes an automake failure. I think
-  # the failure may be caused by a different pkg-config in /usr/local/bin.
-  "cd /",
-  "apk add --update automake autoconf libtool",
-  "VERS=1.2.7",
-  "curl -L https://github.com/void-linux/musl-fts/archive/refs/tags/v$VERS.tar.gz > ./musl-fts.tar.gz",
-  "tar -xf musl-fts.tar.gz",
-  "cd musl-fts-$VERS",
-  "PATH=/usr/bin:/bin ./bootstrap.sh",
-  "CFLAGS=-fPIC ./configure --prefix=/usr",
-  "make install",
-
   # Build the latest elfutils from source. The build steps come from
   # https://git.alpinelinux.org/aports/tree/main/elfutils, and the need to
   # set the FNM_EXTMATCH macro to get the build to succeed is seen here:
   # https://git.alpinelinux.org/aports/tree/main/elfutils/musl-macros.patch
   "cd /",
-  "apk add --update argp-standalone bison bsd-compat-headers bzip2-dev flex-dev libtool linux-headers musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
-  "VERS=0.189",
+  "apk add --update argp-standalone bison bsd-compat-headers bzip2-dev flex-dev libtool linux-headers musl-fts-dev musl-libintl musl-obstack-dev xz-dev zlib-dev zstd-dev",
+  "VERS=0.193",
   "curl https://sourceware.org/elfutils/ftp/$VERS/elfutils-$VERS.tar.bz2 > ./elfutils.tar.bz2",
   "tar -xf elfutils.tar.bz2",
   "cd elfutils-$VERS",
-  "patch libdwfl/dwfl_segment_report_module.c < {package}/build_scripts/elfutils_contiguous_segments.diff",
-  "CFLAGS='-w -DFNM_EXTMATCH=0' ./configure --prefix=/usr --disable-nls --disable-libdebuginfod --disable-debuginfod --with-zstd",
-  "make install"
+  "CFLAGS='-Wno-error -DFNM_EXTMATCH=0 -g -O3' CXXFLAGS='-Wno-error -g -O3' ./configure --disable-nls --enable-libdebuginfod=dummy --disable-debuginfod --with-zstd",
+  "make install",
+
+  # Reinstall libintl, as the Python interpreter requires it
+  "apk del musl-libintl",
+  "apk add libintl",
 ]
 
 [tool.coverage.run]
@@ -121,3 +108,4 @@ show_missing = true
 # pytest retains all temp files from the last 3 test suite runs by default.
 # Keep only ones for failed tests to avoid filling up a disk.
 tmp_path_retention_policy = "failed"
+testpaths = ["tests"]

{pystack-1.4.1 → pystack-1.5.1}/setup.py

@@ -33,6 +33,7 @@ COMPILER_DIRECTIVES = {
     "cdivision": True,
     "c_string_type": "unicode",
     "c_string_encoding": "utf8",
+    "freethreading_compatible": True,
 }
 
 DEFINE_MACROS = []
@@ -50,6 +51,7 @@ if TEST_BUILD:
         "infer_types": True,
         "c_string_type": "unicode",
         "c_string_encoding": "utf8",
+        "freethreading_compatible": True,
     }
     DEFINE_MACROS.extend([("CYTHON_TRACE", "1"), ("CYTHON_TRACE_NOGIL", "1")])
 
@@ -64,6 +66,11 @@ except pkgconfig.PackageNotFoundError as e:
     print("Package Not Found", e)
     print("Falling back to static flags.")
 
+if "define_macros" not in library_flags:
+    library_flags["define_macros"] = []
+
+library_flags["define_macros"].extend(DEFINE_MACROS)
+
 PYSTACK_EXTENSION = setuptools.Extension(
     name="pystack._pystack",
     sources=[
@@ -83,7 +90,6 @@ PYSTACK_EXTENSION = setuptools.Extension(
     language="c++",
     extra_compile_args=["-std=c++17"],
     extra_link_args=["-std=c++17"],
-    define_macros=DEFINE_MACROS,
     **library_flags,
 )
 
@@ -127,7 +133,13 @@ setuptools.setup(
         compiler_directives=COMPILER_DIRECTIVES,
     ),
     install_requires=install_requires,
-    include_package_data=True,
+    include_package_data=False,
+    package_data={
+        "pystack": [
+            "pystack/*.pyi",
+            "pystack/*.typed",
+        ]
+    },
     entry_points={
         "console_scripts": ["pystack=pystack.__main__:main"],
     },

{pystack-1.4.1 → pystack-1.5.1}/src/pystack/__main__.py

@@ -166,6 +166,15 @@ def generate_cli_parser() -> argparse.ArgumentParser:
         help="Include native (C) frames from threads not registered with "
         "the interpreter (implies --native)",
     )
+    remote_parser.add_argument(
+        "--native-last",
+        action="store_const",
+        dest="native_mode",
+        const=NativeReportingMode.LAST,
+        default=NativeReportingMode.OFF,
+        help="Include native (C) frames only after the last python frame "
+        "in the resulting stack trace",
+    )
     remote_parser.add_argument(
         "--locals",
         action="store_true",
@@ -212,6 +221,15 @@ def generate_cli_parser() -> argparse.ArgumentParser:
         help="Include native (C) frames from threads not registered with "
         "the interpreter (implies --native)",
     )
+    core_parser.add_argument(
+        "--native-last",
+        action="store_const",
+        dest="native_mode",
+        const=NativeReportingMode.LAST,
+        default=NativeReportingMode.OFF,
+        help="Include native (C) frames only after the last python frame "
+        "in the resulting stack trace",
+    )
     core_parser.add_argument(
         "--locals",
         action="store_true",
@@ -274,8 +292,7 @@ def process_remote(parser: argparse.ArgumentParser, args: argparse.Namespace) ->
         locals=args.locals,
         method=StackMethod.ALL if args.exhaustive else StackMethod.AUTO,
     ):
-        native = args.native_mode != NativeReportingMode.OFF
-        print_thread(thread, native)
+        print_thread(thread, args.native_mode)
 
 
 def format_psinfo_information(psinfo: Dict[str, Any]) -> str:
@@ -331,7 +348,7 @@ def process_core(parser: argparse.ArgumentParser, args: argparse.Namespace) -> N
     if args.executable is None:
         corefile_analyzer = CoreFileAnalyzer(corefile)
         executable = pathlib.Path(corefile_analyzer.extract_executable())
-        if not executable.exists() or not is_elf(executable):
+        if not is_elf(executable):
             first_map = next(
                 (
                     map
@@ -343,7 +360,6 @@ def process_core(parser: argparse.ArgumentParser, args: argparse.Namespace) -> N
             if (
                 first_map is not None
                 and first_map.path is not None
-                and first_map.path.exists()
                 and is_elf(first_map.path)
             ):
                 executable = first_map.path
@@ -406,8 +422,7 @@ def process_core(parser: argparse.ArgumentParser, args: argparse.Namespace) -> N
         locals=args.locals,
         method=StackMethod.ALL if args.exhaustive else StackMethod.AUTO,
     ):
-        native = args.native_mode != NativeReportingMode.OFF
-        print_thread(thread, native)
+        print_thread(thread, args.native_mode)
 
 
 if __name__ == "__main__":  # pragma: no cover

{pystack-1.4.1 → pystack-1.5.1}/src/pystack/_pystack/cpython/code.h

@@ -197,4 +197,43 @@ typedef struct
 } PyCodeObject;
 }  // namespace Python3_13
 
+namespace Python3_14 {
+typedef uint16_t _Py_CODEUNIT;
+
+typedef struct
+{
+    PyObject_VAR_HEAD PyObject* co_consts;
+    PyObject* co_names;
+    PyObject* co_exceptiontable;
+    int co_flags;
+    int co_argcount;
+    int co_posonlyargcount;
+    int co_kwonlyargcount;
+    int co_stacksize;
+    int co_firstlineno;
+    int co_nlocalsplus;
+    int co_framesize;
+    int co_nlocals;
+    int co_ncellvars;
+    int co_nfreevars;
+    uint32_t co_version;
+    PyObject* co_localsplusnames;
+    PyObject* co_localspluskinds;
+    PyObject* co_filename;
+    PyObject* co_name;
+    PyObject* co_qualname;
+    PyObject* co_linetable;
+    PyObject* co_weakreflist;
+    void* co_executors;
+    void* _co_cached;
+    uintptr_t _co_instrumentation_version;
+    void* _co_monitoring;
+    Py_ssize_t _co_unique_id;
+    int _co_firsttraceable;
+    void* co_extra;
+    /* deal with co_tlbc somehow */
+    char co_code_adaptive[1];
+} PyCodeObject;
+}  // namespace Python3_14
+
 }  // namespace pystack

{pystack-1.4.1 → pystack-1.5.1}/src/pystack/_pystack/cpython/frame.h

@@ -126,4 +126,30 @@ typedef struct _interpreter_frame
 
 }  // namespace Python3_12
 
+namespace Python3_14 {
+
+typedef union _PyStackRef {
+    uintptr_t bits;
+} _PyStackRef;
+
+typedef struct _interpreter_frame
+{
+    _PyStackRef f_executable;
+    void* previous;
+    void* f_funcobj;
+    PyObject* f_globals;
+    PyObject* f_builtins;
+    PyObject* f_locals;
+    PyObject* frame_obj;
+    _Py_CODEUNIT* instr_ptr;
+    _PyStackRef stackpointer;
+    /* int32_t tlbc_index; */
+    uint16_t return_offset;
+    char owner;
+    uint8_t visited;
+    void* localsplus[1];
+} PyFrameObject;
+
+}  // namespace Python3_14
+
 }  // namespace pystack

{pystack-1.4.1 → pystack-1.5.1}/src/pystack/_pystack/cpython/gc.h

@@ -82,4 +82,28 @@ struct _gc_runtime_state
 };
 
 }  // namespace Python3_8
+
+namespace Python3_14 {
+
+struct _gc_runtime_state
+{
+    PyObject* trash_delete_later;
+    int trash_delete_nesting;
+    int enabled;
+    int debug;
+    struct Python3_8::gc_generation young;
+    struct Python3_8::gc_generation old[2];
+    struct Python3_8::gc_generation permanent_generation;
+    struct gc_generation_stats generation_stats[NUM_GENERATIONS];
+    int collecting;
+    PyObject* garbage;
+    PyObject* callbacks;
+    Py_ssize_t heap_size;
+    Py_ssize_t work_to_do;
+    int visited_space;
+    int phase;
+};
+
+}  // namespace Python3_14
+
 }  // namespace pystack

{pystack-1.4.1 → pystack-1.5.1}/src/pystack/_pystack/cpython/interpreter.h

@@ -338,4 +338,82 @@ typedef struct _is
     struct _import_state imports;
 } PyInterpreterState;
 }  // namespace Python3_13
+
+namespace Python3_14 {
+
+struct _pythreadstate;
+
+typedef struct
+{
+    Python3_13::PyMutex mutex;
+    unsigned long long thread;
+    size_t level;
+} _PyRecursiveMutex;
+
+struct _import_state
+{
+    PyObject* modules;
+    PyObject* modules_by_index;
+    PyObject* importlib;
+    int override_frozen_modules;
+    int override_multi_interp_extensions_check;
+    PyObject* import_func;
+    _PyRecursiveMutex lock;
+    /* diagnostic info in PyImport_ImportModuleLevelObject() */
+    struct
+    {
+        int import_level;
+        int64_t accumulated;
+        int header;
+    } find_and_load;
+};
+
+struct _gil_runtime_state
+{
+    unsigned long interval;
+    struct _pythreadstate* last_holder;
+    int locked;
+    unsigned long switch_number;
+    pthread_cond_t cond;
+    pthread_cond_t mutex;
+#ifdef FORCE_SWITCHING
+    pthread_cond_t switch_cond;
+    pthread_cond_t switch_mutex;
+#endif
+};
+
+typedef struct _is
+{
+    struct _ceval_state ceval;
+    void* _malloced;
+    struct _is* next;
+    int64_t id;
+    Py_ssize_t id_refcount;
+    int requires_idref;
+    long _whence;
+    int _initialized;
+    int _ready;
+    int finalizing;
+    uintptr_t last_restart_version;
+    struct pythreads
+    {
+        uint64_t next_unique_id;
+        struct _pythreadstate* head;
+        struct _pythreadstate* preallocated;
+        struct _pythreadstate* main;
+        Py_ssize_t count;
+        size_t stacksize;
+    } threads;
+    void* runtime;
+    struct _pythreadstate* _finalizing;
+    unsigned long _finalizing_id;
+    struct _gc_runtime_state gc;
+    PyObject* sysdict;
+    PyObject* builtins;
+    struct _import_state imports;
+    struct _gil_runtime_state _gil;
+} PyInterpreterState;
+
+}  // namespace Python3_14
+
 }  // namespace pystack

{pystack-1.4.1 → pystack-1.5.1}/src/pystack/_pystack/cpython/runtime.h

@@ -422,6 +422,222 @@ typedef struct pyruntimestate
 } PyRuntimeState;
 
 }  // namespace Python3_13
+
+namespace Python3_14 {
+
+typedef struct _Py_DebugOffsets
+{
+    char cookie[8];
+    uint64_t version;
+    uint64_t free_threaded;
+    // Runtime state offset;
+    struct _runtime_state
+    {
+        uint64_t size;
+        uint64_t finalizing;
+        uint64_t interpreters_head;
+    } runtime_state;
+
+    // Interpreter state offset;
+    struct _interpreter_state
+    {
+        uint64_t size;
+        uint64_t id;
+        uint64_t next;
+        uint64_t threads_head;
+        uint64_t threads_main;
+        uint64_t gc;
+        uint64_t imports_modules;
+        uint64_t sysdict;
+        uint64_t builtins;
+        uint64_t ceval_gil;
+        uint64_t gil_runtime_state;
+        uint64_t gil_runtime_state_enabled;
+        uint64_t gil_runtime_state_locked;
+        uint64_t gil_runtime_state_holder;
+        uint64_t code_object_generation;
+        uint64_t tlbc_generation;
+    } interpreter_state;
+
+    // Thread state offset;
+    struct _thread_state
+    {
+        uint64_t size;
+        uint64_t prev;
+        uint64_t next;
+        uint64_t interp;
+        uint64_t current_frame;
+        uint64_t thread_id;
+        uint64_t native_thread_id;
+        uint64_t datastack_chunk;
+        uint64_t status;
+    } thread_state;
+
+    // InterpreterFrame offset;
+    struct _interpreter_frame
+    {
+        uint64_t size;
+        uint64_t previous;
+        uint64_t executable;
+        uint64_t instr_ptr;
+        uint64_t localsplus;
+        uint64_t owner;
+        uint64_t stackpointer;
+        uint64_t tlbc_index;
+    } interpreter_frame;
+
+    // Code object offset;
+    struct _code_object
+    {
+        uint64_t size;
+        uint64_t filename;
+        uint64_t name;
+        uint64_t qualname;
+        uint64_t linetable;
+        uint64_t firstlineno;
+        uint64_t argcount;
+        uint64_t localsplusnames;
+        uint64_t localspluskinds;
+        uint64_t co_code_adaptive;
+        uint64_t co_tlbc;
+    } code_object;
+
+    // PyObject offset;
+    struct _pyobject
+    {
+        uint64_t size;
+        uint64_t ob_type;
+    } pyobject;
+
+    // PyTypeObject object offset;
+    struct _type_object
+    {
+        uint64_t size;
+        uint64_t tp_name;
+        uint64_t tp_repr;
+        uint64_t tp_flags;
+    } type_object;
+
+    // PyTuple object offset;
+    struct _tuple_object
+    {
+        uint64_t size;
+        uint64_t ob_item;
+        uint64_t ob_size;
+    } tuple_object;
+
+    // PyList object offset;
+    struct _list_object
+    {
+        uint64_t size;
+        uint64_t ob_item;
+        uint64_t ob_size;
+    } list_object;
+
+    // PySet object offset;
+    struct _set_object
+    {
+        uint64_t size;
+        uint64_t used;
+        uint64_t table;
+        uint64_t mask;
+    } set_object;
+
+    // PyDict object offset;
+    struct _dict_object
+    {
+        uint64_t size;
+        uint64_t ma_keys;
+        uint64_t ma_values;
+    } dict_object;
+
+    // PyFloat object offset;
+    struct _float_object
+    {
+        uint64_t size;
+        uint64_t ob_fval;
+    } float_object;
+
+    // PyLong object offset;
+    struct _long_object
+    {
+        uint64_t size;
+        uint64_t lv_tag;
+        uint64_t ob_digit;
+    } long_object;
+
+    // PyBytes object offset;
+    struct _bytes_object
+    {
+        uint64_t size;
+        uint64_t ob_size;
+        uint64_t ob_sval;
+    } bytes_object;
+
+    // Unicode object offset;
+    struct _unicode_object
+    {
+        uint64_t size;
+        uint64_t state;
+        uint64_t length;
+        uint64_t asciiobject_size;
+    } unicode_object;
+
+    // GC runtime state offset;
+    struct _gc
+    {
+        uint64_t size;
+        uint64_t collecting;
+    } gc;
+
+    // Generator object offset;
+    struct _gen_object
+    {
+        uint64_t size;
+        uint64_t gi_name;
+        uint64_t gi_iframe;
+        uint64_t gi_frame_state;
+    } gen_object;
+
+    struct _llist_node
+    {
+        uint64_t next;
+        uint64_t prev;
+    } llist_node;
+
+    struct _debugger_support
+    {
+        uint64_t eval_breaker;
+        uint64_t remote_debugger_support;
+        uint64_t remote_debugging_enabled;
+        uint64_t debugger_pending_call;
+        uint64_t debugger_script_path;
+        uint64_t debugger_script_path_size;
+    } debugger_support;
+} _Py_DebugOffsets;
+
+typedef struct pyruntimestate
+{
+    _Py_DebugOffsets debug_offsets;
+    int _initialized;
+    int preinitializing;
+    int preinitialized;
+    int core_initialized;
+    int initialized;
+    struct _pythreadstate* finalizing;
+    unsigned long _finalizing_id;
+
+    struct pyinterpreters
+    {
+        Python3_13::PyMutex mutex;
+        PyInterpreterState* head;
+        PyInterpreterState* main;
+        int64_t next_id;
+    } interpreters;
+} PyRuntimeState;
+
+}  // namespace Python3_14
+
 typedef union {
     Python3_7::PyRuntimeState v3_7;
     Python3_8::PyRuntimeState v3_8;
@@ -429,6 +645,7 @@ typedef union {
     Python3_11::PyRuntimeState v3_11;
     Python3_12::PyRuntimeState v3_12;
     Python3_13::PyRuntimeState v3_13;
+    Python3_14::PyRuntimeState v3_14;
 } PyRuntimeState;
 
 }  // namespace pystack