Skip to content

Commit 06bd7c7

Browse files
authored
Merge pull request #22245 from keithc-ca/unused_macro
Remove unused definition of J9OBJECT_FROM_JOBJECT
2 parents c96994b + 1ca7f8b commit 06bd7c7

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

runtime/tests/thread/thrstate/thrstatetest.h

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extern void setJ9ThreadState(omrthread_t thr, UDATA flags, omrthread_monitor_t b
4141
omrthread_t owner, UDATA count);
4242
extern void setVMThreadState(J9VMThread *vmthread, omrthread_t osThread,
4343
UDATA publicFlags, j9object_t blockingEnterObject, UDATA lockWord);
44-
extern void setJ9MonitorState(omrthread_monitor_t monitor, omrthread_t owner, UDATA count);
44+
extern void setJ9MonitorState(omrthread_monitor_t monitor, omrthread_t owner, UDATA count);
4545
extern UDATA getFlatLock(J9VMThread *owner, UDATA count);
4646
extern UDATA getInflLock(J9ObjectMonitor *monitor);
4747

@@ -69,20 +69,18 @@ typedef struct testdata_t {
6969

7070
j9object_t objectNoMonitor;
7171
jobject objectNoMonitorRef;
72-
72+
7373
volatile IDATA selfOsthreadDone;
7474
volatile IDATA otherOsthreadDone;
7575
volatile IDATA unattachedOsthreadDone;
7676
volatile IDATA thirdOsthreadDone;
77-
77+
7878
/* unused */
7979
jobject ownableSyncRef;
8080
j9object_t ownableSync;
8181
} testdata_t;
8282
extern testdata_t GlobalTestData;
8383

84-
#define J9OBJECT_FROM_JOBJECT(jobj) (*((j9object_t *)(jobj)))
85-
8684
#define MON_COUNT ((UDATA)3)
8785
#define TESTDATA(zzz) (GlobalTestData.zzz)
8886

@@ -98,34 +96,34 @@ extern testdata_t GlobalTestData;
9896
/*
9997
* v = vmthread
10098
* n = osthread
101-
*
99+
*
102100
* state flags:
103-
* St = started
104-
* D = dead
105-
* Z = suspended
106-
* B = blocked
107-
* W = waiting
108-
* N = notified
109-
* P = parked
110-
* S = sleeping
111-
*
101+
* St = started
102+
* D = dead
103+
* Z = suspended
104+
* B = blocked
105+
* W = waiting
106+
* N = notified
107+
* P = parked
108+
* S = sleeping
109+
*
112110
* object monitors:
113111
* z = null blockingEnterObject
114112
* f = flat blockingEnterObject monitor
115113
* a = inflated blockingEnterObject monitor
116114
* U = out-of-line blockingEnterObject monitor, has montable entry
117115
* u = out-of-line blockingEnterObject monitor, no montable entry
118-
*
116+
*
119117
* raw monitors:
120118
* m = null monitor
121119
* M = non-null monitor (raw)
122-
*
120+
*
123121
* monitor owners:
124122
* o = null owner
125123
* O = self
126124
* N = other (not attached)
127125
* V = other (attached)
128-
*
126+
*
129127
* owned count:
130128
* c = 0 count
131129
* C = >0 count

0 commit comments

Comments
 (0)