From d237d0a4ea392ebec0d5f78b9ccd35937cdcfc61 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 2 Feb 2025 12:25:37 +0200 Subject: [PATCH] Update seastar submodule * seastar 71036ebcc0...5b95d1d798 (3): > rpc stream: do not abort stream queue if stream connection was closed without error > resource: fallback to sysconf when failed to detect memory size from hwloc > Merge 'scheduling_group: improve scheduling group creation exception safety' from Michael Litvak scylla-gdb.py adjusted for scheduling_group_specific data structure changes in Seastar. As part of that, a gratuitous dereference of std::unique_ptr, which fails for std::unique_ptr, was removed. --- scylla-gdb.py | 8 ++++++-- seastar | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scylla-gdb.py b/scylla-gdb.py index 159597aad0..607be9a1b3 100755 --- a/scylla-gdb.py +++ b/scylla-gdb.py @@ -2244,7 +2244,12 @@ class scylla_memory(gdb.Command): reactor = gdb.parse_and_eval('seastar::local_engine') for tq in get_local_task_queues(): sched_group_specific = std_array(reactor['_scheduling_group_specific_data']['per_scheduling_group_data'])[int(tq['_id'])]['specific_vals'] - stats = std_vector(sched_group_specific)[key_id].reinterpret_cast(stats_ptr_type).dereference() + item = std_vector(sched_group_specific)[key_id] + try: + stats_void_ptr = std_unique_ptr(item['valp']).get() + except: + stats_void_ptr = item + stats = stats_void_ptr.reinterpret_cast(stats_ptr_type).dereference() if int(stats['writes']) == 0 and int(stats['background_writes']) == 0 and int(stats['foreground_reads']) == 0 and int(stats['reads']) == 0: continue per_sg_stats[tq] = stats @@ -4277,7 +4282,6 @@ class std_unique_ptr: def get(self): try: - std_tuple(self.obj['_M_t']['_M_t'])[0].dereference() return std_tuple(self.obj['_M_t']['_M_t'])[0] except: return self.obj['_M_t']['_M_t']['_M_head_impl'] diff --git a/seastar b/seastar index 71036ebcc0..5b95d1d798 160000 --- a/seastar +++ b/seastar @@ -1 +1 @@ -Subproject commit 71036ebcc06d9500de8bf85f055a5787ae0982c0 +Subproject commit 5b95d1d798b4ec12b44d7b76411c10302a2c7800