Skip to content

Commit 83f70e8

Browse files
authored
Zowe Suite v2.16.0
2 parents 1a3c363 + 180114f commit 83f70e8

File tree

6 files changed

+17
-6
lines changed

6 files changed

+17
-6
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
All notable changes to the ZSS package will be documented in this file.
44

5+
## `2.16.0`
6+
- Bugfix: AUX should take leap seconds into account in their log messages' timestamp (#690, #691)
7+
58
## `2.14.0`
69
- Bugfix: ZSS would not use zowe.cookieIdentifier when an HA config was used.
710

build/zis.proj.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
PROJECT="zis"
2-
VERSION=2.15.0
3-
DYNLINK_PLUGIN_VERSION=8
2+
VERSION=2.16.0
3+
DYNLINK_PLUGIN_VERSION=9
44
DEPS=""

build/zss.proj.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PROJECT="zss"
2-
VERSION=2.15.0
2+
VERSION=2.16.0
33
DEPS="QUICKJS LIBYAML"
44

55
QUICKJS="quickjs"

manifest.template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: zss
33
# Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/.
44
id: org.zowe.zss
55
# Without the v
6-
version: 2.15.0
6+
version: 2.16.0
77
# Component version is defined in gradle.properties for Gradle project
88
# Human readable component name
99
title: Zowe System Services (ZSS)

zis-aux/src/aux-utils.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -199,19 +199,27 @@ static void getSTCK(uint64 *stckValue) {
199199
__asm(" STCK 0(%0)" : : "r"(stckValue));
200200
}
201201

202-
static int64 getLocalTimeOffset() {
202+
static int64 getLocalTimeOffset(void) {
203203
CVT * __ptr32 cvt = *(void * __ptr32 * __ptr32)0x10;
204204
void * __ptr32 cvtext2 = cvt->cvtext2;
205205
int64 *cvtldto = (int64 * __ptr32)(cvtext2 + 0x38);
206206
return *cvtldto;
207207
}
208208

209+
static int64 getLeapSecondsOffset(void) {
210+
CVT * __ptr32 cvt = *(void * __ptr32 * __ptr32)0x10;
211+
void * __ptr32 cvtext2 = cvt->cvtext2;
212+
int64 *cvtlso = (int64 * __ptr32)(cvtext2 + 0x50);
213+
return *cvtlso;
214+
}
215+
209216
static void getCurrentLogTimestamp(LogTimestamp *timestamp) {
210217

211218
uint64 stck = 0;
212219
getSTCK(&stck);
213220

214221
stck += getLocalTimeOffset();
222+
stck -= getLeapSecondsOffset();
215223

216224
stckToLogTimestamp(stck, timestamp);
217225

0 commit comments

Comments
 (0)