From patchwork Sun May 11 12:34:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Zsolt_Vad=C3=A1sz?= X-Patchwork-Id: 889201 Received: from mail-10698.protonmail.ch (mail-10698.protonmail.ch [79.135.106.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C7E4137C2A for ; Sun, 11 May 2025 12:34:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746966875; cv=none; b=OggQCxWMBCsAHOgmvFvQ60cdztZDDpQgvsUvofAGgvjf2Z4LT+KqMBYAqqXnCAbizNke9n4KStJ5MJ/NDxzJjevKZEUJq3oc4hqrzv04rlF4IvKooW1G/fRwS6K8mNeJfaUbKr7/Wb96ipzKhM341vSUp6G2uqTCZh0NGtsCjLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746966875; c=relaxed/simple; bh=0IEvocJlNyGlKBjZ4e5PGRTnCBe/qg1zECn+oOKhPqg=; h=Date:To:From:Subject:Message-ID:MIME-Version:Content-Type; b=A9Z8CC3xu/HoCo8/mhadtKCRtX04H/1wKsfJejgEeW2y9FWbifJwde3MPdsDmD8jLZLDhxMID1Kv1gQEIX1Z9BGFkPDDyD1F201cS7ozJbWzc7YZiAdkEC/JFztb6jauf+AJNpthMoNsjI8YsQHi1jmcwOM5XCNJSSs6xUtnXls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com; spf=pass smtp.mailfrom=protonmail.com; dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com header.b=XEjtWJoM; arc=none smtp.client-ip=79.135.106.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=protonmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com header.b="XEjtWJoM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1746966870; x=1747226070; bh=eESH0QPdAhl2r6w9kR1WKQ6SRGHu827Z2XeA5NtcYuo=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=XEjtWJoMVtFmyQTfy8dyazr1h807cqElNf5S8OG0fF+FeMStATmsi55tq6WSURZt6 2CPJ4BeyC7C2FSz1bpsj5uM99RHWGvErDjeLUV8f6Qbajt15a0C/4VhTetmB2pzHws XVkFVvIej9nM6CA++BRNSbel+rqKEPagoJ6uNmATKKBdsNRZGAdKjRDW12ptLfrLXc 3Lb1VX0ivA33kFcBkBsVq3IlXUM0xBbaP7ApyCVyKHHoNoA2UeN/r1Qu4wupjBrZB8 x7a2XTeIlzZgSZOC3NEFBLXbdBAlM1chDYUJe5+XDZflSDaj/ETFkO6bEglK3rxKxY YJTfEj78e8Pzg== Date: Sun, 11 May 2025 12:34:28 +0000 To: "linux-media@vger.kernel.org" From: =?utf-8?q?Zsolt_Vad=C3=A1sz?= Subject: [PATCH] v4l2-tracer: Allow building on systems using musl Message-ID: <4dgJekVdP7lLqOQ6JNW05sRHSkRmLLMMQnEn8NGUHPoHDn4SBkaGlHUW89vkJJu3IeFDAh3p6mlplTJJlWJx8V4rr62-hd83quCJ2sIuqoA=@protonmail.com> Feedback-ID: 28710920:user:proton X-Pm-Message-ID: faceba73bc1439f9f5ae4b44d247f48da6fbcc58 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Zsolt Vadasz --- utils/v4l2-tracer/retrace.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/utils/v4l2-tracer/retrace.cpp b/utils/v4l2-tracer/retrace.cpp index 010936c0..0acce10c 100644 --- a/utils/v4l2-tracer/retrace.cpp +++ b/utils/v4l2-tracer/retrace.cpp @@ -10,10 +10,14 @@ extern struct retrace_context ctx_retrace; void retrace_mmap(json_object *mmap_obj, bool is_mmap64) { json_object *mmap_args_obj; +#if defined(linux) && defined(__GLIBC__) if (is_mmap64) json_object_object_get_ex(mmap_obj, "mmap64", &mmap_args_obj); else json_object_object_get_ex(mmap_obj, "mmap", &mmap_args_obj); +#else + json_object_object_get_ex(mmap_obj, "mmap", &mmap_args_obj); +#endif json_object *len_obj; json_object_object_get_ex(mmap_args_obj, "len", &len_obj); @@ -46,16 +50,24 @@ void retrace_mmap(json_object *mmap_obj, bool is_mmap64) return; void *buf_address_retrace_pointer = nullptr; +#if defined(linux) && defined(__GLIBC__) if (is_mmap64) buf_address_retrace_pointer = mmap64(0, len, prot, flags, fd_retrace, off); else buf_address_retrace_pointer = mmap(0, len, prot, flags, fd_retrace, off); +#else + buf_address_retrace_pointer = mmap(0, len, prot, flags, fd_retrace, off); +#endif if (buf_address_retrace_pointer == MAP_FAILED) { +#if defined(linux) && defined(__GLIBC__) if (is_mmap64) perror("mmap64"); else perror("mmap"); +#else + perror("mmap"); +#endif debug_line_info(); print_context(); exit(EXIT_FAILURE); @@ -116,10 +128,14 @@ void retrace_open(json_object *jobj, bool is_open64) int fd_trace = json_object_get_int(fd_trace_obj); json_object *open_args_obj; +#if defined(linux) && defined(__GLIBC__) if (is_open64) json_object_object_get_ex(jobj, "open64", &open_args_obj); else json_object_object_get_ex(jobj, "open", &open_args_obj); +#else + json_object_object_get_ex(jobj, "open", &open_args_obj); +#endif json_object *path_obj; std::string path_trace; @@ -148,10 +164,14 @@ void retrace_open(json_object *jobj, bool is_open64) mode = s2number(json_object_get_string(mode_obj)); int fd_retrace = 0; +#if defined(linux) && defined(__GLIBC__) if (is_open64) fd_retrace = open64(path_retrace.c_str(), oflag, mode); else fd_retrace = open(path_retrace.c_str(), oflag, mode); +#else + fd_retrace = open(path_retrace.c_str(), oflag, mode); +#endif if (fd_retrace <= 0) { line_info("\n\tCan't open: %s", path_retrace.c_str()); @@ -162,10 +182,14 @@ void retrace_open(json_object *jobj, bool is_open64) if (is_verbose() || errno != 0) { fprintf(stderr, "path: %s ", path_retrace.c_str()); +#if defined(linux) && defined(__GLIBC__) if (is_open64) perror("open64"); else perror("open"); +#else + perror("open"); +#endif debug_line_info(); print_context(); }