Skip to content

Commit f43d14a

Browse files
albluekevinjwalls
alblue
authored and
kevinjwalls
committed
8264396: Use the blessed modifier order in jdk.internal.jvmstat
Reviewed-by: cjplummer, kevinw, shade
1 parent 6225ae6 commit f43d14a

File tree

5 files changed

+84
-84
lines changed

5 files changed

+84
-84
lines changed

‎src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -61,28 +61,28 @@ public abstract class AbstractPerfDataBufferPrologue {
6161
* the following constants must match the field offsets and sizes
6262
* in the PerfDataPrologue structure in perfMemory.hpp
6363
*/
64-
final static int PERFDATA_PROLOG_OFFSET=0;
65-
final static int PERFDATA_PROLOG_MAGIC_OFFSET=0;
66-
final static int PERFDATA_PROLOG_BYTEORDER_OFFSET=4;
67-
final static int PERFDATA_PROLOG_BYTEORDER_SIZE=1; // sizeof(byte)
68-
final static int PERFDATA_PROLOG_MAJOR_OFFSET=5;
69-
final static int PERFDATA_PROLOG_MAJOR_SIZE=1; // sizeof(byte)
70-
final static int PERFDATA_PROLOG_MINOR_OFFSET=6;
71-
final static int PERFDATA_PROLOG_MINOR_SIZE=1; // sizeof(byte)
72-
final static int PERFDATA_PROLOG_RESERVEDB1_OFFSET=7;
73-
final static int PERFDATA_PROLOG_RESERVEDB1_SIZE=1; // sizeof(byte)
74-
75-
final static int PERFDATA_PROLOG_SIZE=8; // sizeof(struct PerfDataProlog)
64+
static final int PERFDATA_PROLOG_OFFSET=0;
65+
static final int PERFDATA_PROLOG_MAGIC_OFFSET=0;
66+
static final int PERFDATA_PROLOG_BYTEORDER_OFFSET=4;
67+
static final int PERFDATA_PROLOG_BYTEORDER_SIZE=1; // sizeof(byte)
68+
static final int PERFDATA_PROLOG_MAJOR_OFFSET=5;
69+
static final int PERFDATA_PROLOG_MAJOR_SIZE=1; // sizeof(byte)
70+
static final int PERFDATA_PROLOG_MINOR_OFFSET=6;
71+
static final int PERFDATA_PROLOG_MINOR_SIZE=1; // sizeof(byte)
72+
static final int PERFDATA_PROLOG_RESERVEDB1_OFFSET=7;
73+
static final int PERFDATA_PROLOG_RESERVEDB1_SIZE=1; // sizeof(byte)
74+
75+
static final int PERFDATA_PROLOG_SIZE=8; // sizeof(struct PerfDataProlog)
7676

7777
// these constants should match their #define counterparts in perfMemory.hpp
78-
final static byte PERFDATA_BIG_ENDIAN=0;
79-
final static byte PERFDATA_LITTLE_ENDIAN=1;
80-
final static int PERFDATA_MAGIC = 0xcafec0c0;
78+
static final byte PERFDATA_BIG_ENDIAN=0;
79+
static final byte PERFDATA_LITTLE_ENDIAN=1;
80+
static final int PERFDATA_MAGIC = 0xcafec0c0;
8181

8282
// names for counters that expose the prolog fields
83-
public final static String PERFDATA_MAJOR_NAME =
83+
public static final String PERFDATA_MAJOR_NAME =
8484
"sun.perfdata.majorVersion";
85-
public final static String PERFDATA_MINOR_NAME =
85+
public static final String PERFDATA_MINOR_NAME =
8686
"sun.perfdata.minorVersion";
8787

8888
/**

‎src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBuffer.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -54,21 +54,21 @@ public class PerfDataBuffer extends PerfDataBufferImpl {
5454
* the following constants must be kept in sync with struct
5555
* PerfDataEntry in perfMemory.hpp
5656
*/
57-
private final static int PERFDATA_ENTRYLENGTH_OFFSET=0;
58-
private final static int PERFDATA_ENTRYLENGTH_SIZE=4; // sizeof(int)
59-
private final static int PERFDATA_NAMELENGTH_OFFSET=4;
60-
private final static int PERFDATA_NAMELENGTH_SIZE=4; // sizeof(int)
61-
private final static int PERFDATA_VECTORLENGTH_OFFSET=8;
62-
private final static int PERFDATA_VECTORLENGTH_SIZE=4; // sizeof(int)
63-
private final static int PERFDATA_DATATYPE_OFFSET=12;
64-
private final static int PERFDATA_DATATYPE_SIZE=1; // sizeof(byte)
65-
private final static int PERFDATA_FLAGS_OFFSET=13;
66-
private final static int PERFDATA_FLAGS_SIZE=1; // sizeof(byte)
67-
private final static int PERFDATA_DATAUNITS_OFFSET=14;
68-
private final static int PERFDATA_DATAUNITS_SIZE=1; // sizeof(byte)
69-
private final static int PERFDATA_DATAATTR_OFFSET=15;
70-
private final static int PERFDATA_DATAATTR_SIZE=1; // sizeof(byte)
71-
private final static int PERFDATA_NAME_OFFSET=16;
57+
private static final int PERFDATA_ENTRYLENGTH_OFFSET=0;
58+
private static final int PERFDATA_ENTRYLENGTH_SIZE=4; // sizeof(int)
59+
private static final int PERFDATA_NAMELENGTH_OFFSET=4;
60+
private static final int PERFDATA_NAMELENGTH_SIZE=4; // sizeof(int)
61+
private static final int PERFDATA_VECTORLENGTH_OFFSET=8;
62+
private static final int PERFDATA_VECTORLENGTH_SIZE=4; // sizeof(int)
63+
private static final int PERFDATA_DATATYPE_OFFSET=12;
64+
private static final int PERFDATA_DATATYPE_SIZE=1; // sizeof(byte)
65+
private static final int PERFDATA_FLAGS_OFFSET=13;
66+
private static final int PERFDATA_FLAGS_SIZE=1; // sizeof(byte)
67+
private static final int PERFDATA_DATAUNITS_OFFSET=14;
68+
private static final int PERFDATA_DATAUNITS_SIZE=1; // sizeof(byte)
69+
private static final int PERFDATA_DATAATTR_OFFSET=15;
70+
private static final int PERFDATA_DATAATTR_SIZE=1; // sizeof(byte)
71+
private static final int PERFDATA_NAME_OFFSET=16;
7272

7373
PerfDataBufferPrologue prologue;
7474
int nextEntry;

‎src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -56,19 +56,19 @@ public class PerfDataBufferPrologue extends AbstractPerfDataBufferPrologue {
5656
* the following constants must match the field offsets and sizes
5757
* in the PerfDataPrologue structure in perfMemory.hpp
5858
*/
59-
final static int PERFDATA_PROLOG_USED_OFFSET=8;
60-
final static int PERFDATA_PROLOG_USED_SIZE=4; // sizeof(int)
61-
final static int PERFDATA_PROLOG_OVERFLOW_OFFSET=12;
62-
final static int PERFDATA_PROLOG_OVERFLOW_SIZE=4; // sizeof(int)
63-
final static int PERFDATA_PROLOG_MODTIMESTAMP_OFFSET=16;
64-
final static int PERFDATA_PROLOG_MODTIMESTAMP_SIZE=8; // sizeof(long)
65-
final static int PERFDATA_PROLOG_SIZE=24; // sizeof(struct PerfDataProlog)
59+
static final int PERFDATA_PROLOG_USED_OFFSET=8;
60+
static final int PERFDATA_PROLOG_USED_SIZE=4; // sizeof(int)
61+
static final int PERFDATA_PROLOG_OVERFLOW_OFFSET=12;
62+
static final int PERFDATA_PROLOG_OVERFLOW_SIZE=4; // sizeof(int)
63+
static final int PERFDATA_PROLOG_MODTIMESTAMP_OFFSET=16;
64+
static final int PERFDATA_PROLOG_MODTIMESTAMP_SIZE=8; // sizeof(long)
65+
static final int PERFDATA_PROLOG_SIZE=24; // sizeof(struct PerfDataProlog)
6666

6767
// counter names for prologue psuedo counters
68-
final static String PERFDATA_BUFFER_SIZE_NAME = "sun.perfdata.size";
69-
final static String PERFDATA_BUFFER_USED_NAME = "sun.perfdata.used";
70-
final static String PERFDATA_OVERFLOW_NAME = "sun.perfdata.overflow";
71-
final static String PERFDATA_MODTIMESTAMP_NAME = "sun.perfdata.timestamp";
68+
static final String PERFDATA_BUFFER_SIZE_NAME = "sun.perfdata.size";
69+
static final String PERFDATA_BUFFER_USED_NAME = "sun.perfdata.used";
70+
static final String PERFDATA_OVERFLOW_NAME = "sun.perfdata.overflow";
71+
static final String PERFDATA_MODTIMESTAMP_NAME = "sun.perfdata.timestamp";
7272

7373
/**
7474
* Create an instance of PerfDataBufferPrologue from the given

‎src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -74,22 +74,22 @@ public class PerfDataBuffer extends PerfDataBufferImpl {
7474
* generally unused in this code, but they are kept consistent with
7575
* the data structure just in case some unforseen need arrises.
7676
*/
77-
private final static int PERFDATA_ENTRYLENGTH_OFFSET=0;
78-
private final static int PERFDATA_ENTRYLENGTH_SIZE=4; // sizeof(int)
79-
private final static int PERFDATA_NAMEOFFSET_OFFSET=4;
80-
private final static int PERFDATA_NAMEOFFSET_SIZE=4; // sizeof(int)
81-
private final static int PERFDATA_VECTORLENGTH_OFFSET=8;
82-
private final static int PERFDATA_VECTORLENGTH_SIZE=4; // sizeof(int)
83-
private final static int PERFDATA_DATATYPE_OFFSET=12;
84-
private final static int PERFDATA_DATATYPE_SIZE=1; // sizeof(byte)
85-
private final static int PERFDATA_FLAGS_OFFSET=13;
86-
private final static int PERFDATA_FLAGS_SIZE=1; // sizeof(byte)
87-
private final static int PERFDATA_DATAUNITS_OFFSET=14;
88-
private final static int PERFDATA_DATAUNITS_SIZE=1; // sizeof(byte)
89-
private final static int PERFDATA_DATAVAR_OFFSET=15;
90-
private final static int PERFDATA_DATAVAR_SIZE=1; // sizeof(byte)
91-
private final static int PERFDATA_DATAOFFSET_OFFSET=16;
92-
private final static int PERFDATA_DATAOFFSET_SIZE=4; // sizeof(int)
77+
private static final int PERFDATA_ENTRYLENGTH_OFFSET=0;
78+
private static final int PERFDATA_ENTRYLENGTH_SIZE=4; // sizeof(int)
79+
private static final int PERFDATA_NAMEOFFSET_OFFSET=4;
80+
private static final int PERFDATA_NAMEOFFSET_SIZE=4; // sizeof(int)
81+
private static final int PERFDATA_VECTORLENGTH_OFFSET=8;
82+
private static final int PERFDATA_VECTORLENGTH_SIZE=4; // sizeof(int)
83+
private static final int PERFDATA_DATATYPE_OFFSET=12;
84+
private static final int PERFDATA_DATATYPE_SIZE=1; // sizeof(byte)
85+
private static final int PERFDATA_FLAGS_OFFSET=13;
86+
private static final int PERFDATA_FLAGS_SIZE=1; // sizeof(byte)
87+
private static final int PERFDATA_DATAUNITS_OFFSET=14;
88+
private static final int PERFDATA_DATAUNITS_SIZE=1; // sizeof(byte)
89+
private static final int PERFDATA_DATAVAR_OFFSET=15;
90+
private static final int PERFDATA_DATAVAR_SIZE=1; // sizeof(byte)
91+
private static final int PERFDATA_DATAOFFSET_OFFSET=16;
92+
private static final int PERFDATA_DATAOFFSET_SIZE=4; // sizeof(int)
9393

9494
PerfDataBufferPrologue prologue;
9595
int nextEntry;

‎src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,8 @@
5151
*/
5252
public class PerfDataBufferPrologue extends AbstractPerfDataBufferPrologue {
5353

54-
private final static int SUPPORTED_MAJOR_VERSION = 2;
55-
private final static int SUPPORTED_MINOR_VERSION = 0;
54+
private static final int SUPPORTED_MAJOR_VERSION = 2;
55+
private static final int SUPPORTED_MINOR_VERSION = 0;
5656

5757
/*
5858
* the following constants must match the field offsets and sizes
@@ -62,27 +62,27 @@ public class PerfDataBufferPrologue extends AbstractPerfDataBufferPrologue {
6262
* note that PERFDATA_PROLOG_ACCESSIBLE_OFFSET redefines
6363
* PERFDATA_PROLOG_RESERVEDB1_OFFSET from AbstractPerfDataBufferPrologue.
6464
*/
65-
final static int PERFDATA_PROLOG_ACCESSIBLE_OFFSET=7;
66-
final static int PERFDATA_PROLOG_ACCESSIBLE_SIZE=1; // sizeof(byte)
67-
final static int PERFDATA_PROLOG_USED_OFFSET=8;
68-
final static int PERFDATA_PROLOG_USED_SIZE=4; // sizeof(int)
69-
final static int PERFDATA_PROLOG_OVERFLOW_OFFSET=12;
70-
final static int PERFDATA_PROLOG_OVERFLOW_SIZE=4; // sizeof(int)
71-
final static int PERFDATA_PROLOG_MODTIMESTAMP_OFFSET=16;
72-
final static int PERFDATA_PROLOG_MODTIMESTAMP_SIZE=8; // sizeof(long)
73-
final static int PERFDATA_PROLOG_ENTRYOFFSET_OFFSET=24;
74-
final static int PERFDATA_PROLOG_ENTRYOFFSET_SIZE=4; // sizeof(int)
75-
final static int PERFDATA_PROLOG_NUMENTRIES_OFFSET=28;
76-
final static int PERFDATA_PROLOG_NUMENTRIES_SIZE=4; // sizeof(int)
65+
static final int PERFDATA_PROLOG_ACCESSIBLE_OFFSET=7;
66+
static final int PERFDATA_PROLOG_ACCESSIBLE_SIZE=1; // sizeof(byte)
67+
static final int PERFDATA_PROLOG_USED_OFFSET=8;
68+
static final int PERFDATA_PROLOG_USED_SIZE=4; // sizeof(int)
69+
static final int PERFDATA_PROLOG_OVERFLOW_OFFSET=12;
70+
static final int PERFDATA_PROLOG_OVERFLOW_SIZE=4; // sizeof(int)
71+
static final int PERFDATA_PROLOG_MODTIMESTAMP_OFFSET=16;
72+
static final int PERFDATA_PROLOG_MODTIMESTAMP_SIZE=8; // sizeof(long)
73+
static final int PERFDATA_PROLOG_ENTRYOFFSET_OFFSET=24;
74+
static final int PERFDATA_PROLOG_ENTRYOFFSET_SIZE=4; // sizeof(int)
75+
static final int PERFDATA_PROLOG_NUMENTRIES_OFFSET=28;
76+
static final int PERFDATA_PROLOG_NUMENTRIES_SIZE=4; // sizeof(int)
7777

78-
final static int PERFDATA_PROLOG_SIZE=32; // sizeof(struct PerfDataProlog)
78+
static final int PERFDATA_PROLOG_SIZE=32; // sizeof(struct PerfDataProlog)
7979

8080
// names for counters that expose prologue fields
81-
final static String PERFDATA_BUFFER_SIZE_NAME = "sun.perfdata.size";
82-
final static String PERFDATA_BUFFER_USED_NAME = "sun.perfdata.used";
83-
final static String PERFDATA_OVERFLOW_NAME = "sun.perfdata.overflow";
84-
final static String PERFDATA_MODTIMESTAMP_NAME = "sun.perfdata.timestamp";
85-
final static String PERFDATA_NUMENTRIES_NAME = "sun.perfdata.entries";
81+
static final String PERFDATA_BUFFER_SIZE_NAME = "sun.perfdata.size";
82+
static final String PERFDATA_BUFFER_USED_NAME = "sun.perfdata.used";
83+
static final String PERFDATA_OVERFLOW_NAME = "sun.perfdata.overflow";
84+
static final String PERFDATA_MODTIMESTAMP_NAME = "sun.perfdata.timestamp";
85+
static final String PERFDATA_NUMENTRIES_NAME = "sun.perfdata.entries";
8686

8787
/**
8888
* Create an instance of PerfDataBufferPrologue from the given

0 commit comments

Comments
 (0)