Commit b3362121 authored Jan 07, 2014 by Satoshi, Baba X Committed by Torbjorn Eklund Apr 12, 2018

Improve correlation between log id in RILJ log and token id in modem log

Telephony FWK truncates serial number of RILJ requests to four digits
before outputting as log id in radio log. However, this truncation also
modifies the number which causes the resulting log id to have very
unclear correlation with the serial number. This serial number is used
in modem requests and will show up in modem logs in some
implementations. This commit tries to reconcile the requirement on
Telephony log with these implementations.

This patch changes the truncation to keep the last four digits in the
serial number intact in order to improve the correlation between the log
id in RILJ radio log and token id in modem log.

Prevents the serial number from becoming negative by wrapping to 0 when
reaching Integer.MAX_VALUE and preventing negative number from being
randomly generated when serial number is reset. This change ensures
that log id is always increasing when they are incremented and
truncated.

Bug: 74054019
Test: Manual
Change-Id: Ib9ee1c8f6333ecfd1105a7eb5cbe0e96c2e3c4dd

parent c79de666

src/java/com/android/internal/telephony/RILRequest.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@ public class RILRequest {
		rr = new RILRequest();
		}

		rr.mSerial = sNextSerial.getAndIncrement();
		// Increment serial number. Wrap to 0 when reaching Integer.MAX_VALUE.
		rr.mSerial = sNextSerial.getAndUpdate(n -> ((n + 1) % Integer.MAX_VALUE));

		rr.mRequest = request;
		rr.mResult = result;
		@@ -151,9 +152,9 @@ public class RILRequest {
		}

		static void resetSerial() {
		// use a random so that on recovery we probably don't mix old requests
		// Use a non-negative random number so that on recovery we probably don't mix old requests
		// with new.
		sNextSerial.set(sRandom.nextInt());
		sNextSerial.set(sRandom.nextInt(Integer.MAX_VALUE));
		}

		String serialString() {
		@@ -161,9 +162,9 @@ public class RILRequest {
		StringBuilder sb = new StringBuilder(8);
		String sn;

		long adjustedSerial = (((long) mSerial) - Integer.MIN_VALUE) % 10000;

		sn = Long.toString(adjustedSerial);
		// Truncate mSerial to a number with maximum 4 digits.
		int adjustedSerial = mSerial % 10000;
		sn = Integer.toString(adjustedSerial);

		//sb.append("J[");
		sb.append('[');