From 6d6a19972810cf10b45b5e19f98d64be4376df89 Mon Sep 17 00:00:00 2001 From: KNEMC <2014539504@qq.com> Date: Tue, 1 Sep 2026 15:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8ANTP=E4=BB=8E=E5=B9=B3=E5=9D=87?= =?UTF-8?q?=E6=95=B0=E6=94=B9=E6=88=90=E4=B8=AD=E4=BD=8D=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=9E=81=E7=AB=AF=E5=80=BC=E5=B9=B2=E6=89=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/org/kne/cloud/clock/NTPTimestamps.java | 26 ++++++++++++++ .../network/klalb/ui/LineMonitorGUI.java | 4 +-- ...peedAndTrafficAndDelayMonitorDataImpl.java | 24 ++++++------- src/org/kne/cloud/network/ntp/NTPContext.java | 35 ++++--------------- .../kne/cloud/network/ntp/NTPv4Protocol.java | 15 +------- 5 files changed, 48 insertions(+), 56 deletions(-) diff --git a/src/org/kne/cloud/clock/NTPTimestamps.java b/src/org/kne/cloud/clock/NTPTimestamps.java index e89fe92..53f1811 100644 --- a/src/org/kne/cloud/clock/NTPTimestamps.java +++ b/src/org/kne/cloud/clock/NTPTimestamps.java @@ -5,6 +5,9 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; import org.kne.math.Long128; @@ -256,4 +259,27 @@ public class NTPTimestamps { .setBit(63); } } + + public static Long128 median(List values) { + Objects.requireNonNull(values); + if ( values.isEmpty()) { + throw new IllegalArgumentException("列表不能为空"); + } + + // 1. 创建副本并排序 + List sorted = new ArrayList<>(values); + sorted.sort(Long128::compareTo); + + // 2. 计算中位数 + int size = sorted.size(); + if (size % 2 == 1) { + // 奇数个：取中间值 + return sorted.get(size / 2); + } else { + // 偶数个：取中间两个的平均值 + Long128 left = sorted.get(size / 2 - 1); + Long128 right = sorted.get(size / 2); + return left.add(right).divide(Long128.valueOf(2)); + } + } } \ No newline at end of file diff --git a/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java b/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java index f0684ae..494870b 100644 --- a/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java +++ b/src/org/kne/cloud/network/klalb/ui/LineMonitorGUI.java @@ -178,8 +178,8 @@ public class LineMonitorGUI extends XFrame { jbfcv.getXYPlot().setBackgroundPaint(Color.BLACK); jbfcv.getXYPlot().getRenderer().setSeriesPaint(0, Color.CYAN); jbfcv.getXYPlot().getRenderer().setSeriesPaint(1, Color.YELLOW); - jbfcv.getXYPlot().getRenderer().setSeriesPaint(2, Color.GREEN); - jbfcv.getXYPlot().getRenderer().setSeriesPaint(3, Color.RED); + jbfcv.getXYPlot().getRenderer().setSeriesPaint(2, Color.RED); + jbfcv.getXYPlot().getRenderer().setSeriesPaint(3, Color.GREEN); changeFont(jbfcv); sbpdpv = new JLabel(); sbpdpv.setBorder(new LineBorder(Color.DARK_GRAY)); diff --git a/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java b/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java index 19cfc4d..9230952 100644 --- a/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java +++ b/src/org/kne/cloud/network/monitor/SpeedAndTrafficAndDelayMonitorDataImpl.java @@ -20,26 +20,26 @@ public class SpeedAndTrafficAndDelayMonitorDataImpl extends SpeedAndTrafficMonit downSampler.update(); if(upSampler.getSnapshotPacketCount()>0&&upSampler.getSnapshotTotalDelay()>0) { getUploadBandwidth(). recordPacket(KLALBUtils.createGlobalUUID(),0, 0, upSampler.getAvgDelayNanos()); + long odelay=upSampler.getMinDelayNanos(); + if(outDelayMin==Long.MAX_VALUE||odelay<=outDelayMin) { + outDelayMin=odelay; + }else{ + outDelayMin=Math.min(odelay, outDelayMin+10000); + } } if(downSampler.getSnapshotPacketCount()>0&&downSampler.getSnapshotTotalDelay()>0) { getDownloadBandwidth(). recordPacket(KLALBUtils.createGlobalUUID(),0, 0, downSampler.getAvgDelayNanos()); + long idelay=downSampler.getMinDelayNanos(); + if(inDelayMin==Long.MAX_VALUE||idelay<=inDelayMin) { + inDelayMin=idelay; + }else{ + inDelayMin=Math.min(idelay, inDelayMin+10000); + } } long time=System.nanoTime(); if(time-stime>timewindowmax) { stime=time; - long idelay=getInDelay(); - if(inDelayMin==Long.MAX_VALUE||idelay<=inDelayMin) { - inDelayMin=idelay; - }else{ - inDelayMin=(inDelayMin*99+idelay)/100; - } - long odelay=getOutDelay(); - if(outDelayMin==Long.MAX_VALUE||odelay<=outDelayMin) { - outDelayMin=odelay; - }else{ - outDelayMin=(outDelayMin*99+odelay)/100; - } } } diff --git a/src/org/kne/cloud/network/ntp/NTPContext.java b/src/org/kne/cloud/network/ntp/NTPContext.java index c3997bc..5d7f870 100644 --- a/src/org/kne/cloud/network/ntp/NTPContext.java +++ b/src/org/kne/cloud/network/ntp/NTPContext.java @@ -26,7 +26,7 @@ import org.kne.math.Long128; public class NTPContext implements Closeable, AutoCloseable { private HighAccuracyClock clock; private static final boolean debug = false; - private static final int REQUEST_COUNT = 10; + private static final int REQUEST_COUNT = 5; private Long128 systemFrequencyOffset = NTPTimestamps.nanosToNtp128BitTimeInterval(new Long128(5000)); private Long128 localPrecision = NTPTimestamps.nanosToNtp128BitTimeInterval(new Long128(1000)); @@ -117,7 +117,7 @@ public class NTPContext implements Closeable, AutoCloseable { } protected void putPacket(NTPv4Packet nv4, MultiProtocolSocketAddress inetSocketAddress) { - checkIP(); + //checkIP(); List newv = new Vector(); List oldv = recvmap.putIfAbsent(inetSocketAddress, newv); if (oldv == null) { @@ -132,25 +132,6 @@ public class NTPContext implements Closeable, AutoCloseable { } } - private void checkIP() { - Set>> ens = recvmap.entrySet(); - for (Iterator>> iterator = ens.iterator(); iterator - .hasNext();) { - Entry> entry = (Entry>) iterator - .next(); - AtomicBoolean ab = new AtomicBoolean(false); - ios.forEach((x) -> { - if (!ab.get()) - if (x.findPeer(entry.getKey()) != null) { - ab.set(true); - return; - } - }); - if (!ab.get()) { - iterator.remove(); - } - } - } private class PeerInfo implements Comparable { private MultiProtocolSocketAddress address; @@ -225,14 +206,12 @@ public class NTPContext implements Closeable, AutoCloseable { PeerInfo pix = peerInfo.get(0); currentClock = pix; int i; - int m = Math.min(peerInfo.size(), 3); - Long128 bi = Long128.ZERO; - for (i = 0; i < m; i++) { - PeerInfo pi = peerInfo.get(i); - Long128 adjt = pi.getAdj(); - bi = bi.add(adjt); + List adjts = new ArrayList<>(); + for (i = 0; i < peerInfo.size(); i++) { + adjts.add(peerInfo.get(i).getAdj()); } - Long128 delta = bi.divide(Long128.valueOf(i)); + Long128 delta = NTPTimestamps. median(adjts); + //System.out.println(adjts+":"+delta); avgAdj=(avgAdj*7+delta.abs().longValue())/8; Long128 deltaabs=delta.abs(); if (deltaabs.compareTo(adjustThreshold0) > 0&&firstSync.compareAndSet(true, false)) { diff --git a/src/org/kne/cloud/network/ntp/NTPv4Protocol.java b/src/org/kne/cloud/network/ntp/NTPv4Protocol.java index 2b51f20..8ff35a0 100644 --- a/src/org/kne/cloud/network/ntp/NTPv4Protocol.java +++ b/src/org/kne/cloud/network/ntp/NTPv4Protocol.java @@ -405,18 +405,5 @@ public class NTPv4Protocol implements Closeable, AutoCloseable { return dgs.isClosed(); } - public static void main(String[] args) throws IOException, InterruptedException { - HighAccuracyClock hac = new HighAccuracyClock(); - NTPContext context = new NTPContext(hac); - System.out.println(context); - NTPv4Protocol nvc = new NTPv4Protocol(context, new MultiProtocolSocketAddress("{UDP}0.0.0.0:123"));// 106.55.184.199 - nvc.getPeers().add(new NTPPeer("{UDP}106.55.184.199:123", NTPv4Packet.NTP_CLIENT)); - nvc.getPeers().add(new NTPPeer("{UDP}time.windows.com:123", NTPv4Packet.NTP_CLIENT)); - nvc.getPeers().add(new NTPPeer("{UDP}127.0.0.1:123", NTPv4Packet.NTP_SYMMETRIC_ACTIVE)); - /* - * for (int i = 0; i < 10000; i++) { Thread.sleep(1000); - * System.out.println(context.getCurrentSelfDispersion128()); - * System.out.println(context); } - */ - } + }