From 3fbccb01dcffe9eb48a08d99aab0e9aa311a18cf Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Thu, 4 Jan 2024 17:22:49 +0000 Subject: [PATCH] 8322978: Remove debug agent debugMonitorTimedWait() function. It is no longer used. Reviewed-by: dholmes, sspitsyn --- .../share/native/libjdwp/util.c | 19 +------------------ .../share/native/libjdwp/util.h | 3 +-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.c b/src/jdk.jdwp.agent/share/native/libjdwp/util.c index 6ac15d3de6e..0bb7c8837d8 100644 --- a/src/jdk.jdwp.agent/share/native/libjdwp/util.c +++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1073,23 +1073,6 @@ debugMonitorWait(jrawMonitorID monitor) } } -void -debugMonitorTimedWait(jrawMonitorID monitor, jlong millis) -{ - jvmtiError error; - error = JVMTI_FUNC_PTR(gdata->jvmti,RawMonitorWait) - (gdata->jvmti, monitor, millis); - if (error == JVMTI_ERROR_INTERRUPT) { - /* See comment above */ - handleInterrupt(); - error = JVMTI_ERROR_NONE; - } - error = ignore_vm_death(error); - if (error != JVMTI_ERROR_NONE) { - EXIT_ERROR(error, "on raw monitor timed wait"); - } -} - void debugMonitorNotify(jrawMonitorID monitor) { diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h index 7e3ff7047e9..c5b8a2b5f51 100644 --- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h +++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -354,7 +354,6 @@ jrawMonitorID debugMonitorCreate(char *name); void debugMonitorEnter(jrawMonitorID theLock); void debugMonitorExit(jrawMonitorID theLock); void debugMonitorWait(jrawMonitorID theLock); -void debugMonitorTimedWait(jrawMonitorID theLock, jlong millis); void debugMonitorNotify(jrawMonitorID theLock); void debugMonitorNotifyAll(jrawMonitorID theLock); void debugMonitorDestroy(jrawMonitorID theLock);