Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b02980 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

SyncManager: Log # of jobs loaded, and saved most recently. 

Also moved the "wtf for cancelAll for the system UID" code to catch
other entry points.

Bug: 64536115
Test: Manual

Change-Id: I55ff515ad70263d6f953f18d6be02f6292742efa
parent f9c0f065

services/core/java/com/android/server/content/SyncManager.java

+12 −4
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ import com.android.server.backup.AccountSyncSettingsBackupHelper; 
import com.android.server.content.SyncStorageEngine.AuthorityInfo;

import com.android.server.content.SyncStorageEngine.AuthorityInfo;

import com.android.server.content.SyncStorageEngine.EndPoint;

import com.android.server.content.SyncStorageEngine.EndPoint;

import com.android.server.content.SyncStorageEngine.OnSyncRequestListener;

import com.android.server.content.SyncStorageEngine.OnSyncRequestListener;

import com.android.server.job.JobSchedulerInternal.JobStorePersistStats;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -403,12 +404,21 @@ public class SyncManager { 
        return (networkInfo != null) && networkInfo.isConnected();

        return (networkInfo != null) && networkInfo.isConnected();

    }

    }





    private String getJobStats() {

        JobSchedulerInternal js = LocalServices.getService(JobSchedulerInternal.class);

        return "JobStats: "

                + ((js == null) ? "(JobSchedulerInternal==null)"

                : js.getPersistStats().toString());

    }



    private BroadcastReceiver mShutdownIntentReceiver =

    private BroadcastReceiver mShutdownIntentReceiver =

            new BroadcastReceiver() {

            new BroadcastReceiver() {

                @Override

                @Override

                public void onReceive(Context context, Intent intent) {

                public void onReceive(Context context, Intent intent) {

                    Log.w(TAG, "Writing sync state before shutdown...");

                    Log.w(TAG, "Writing sync state before shutdown...");

                    getSyncStorageEngine().writeAllState();

                    getSyncStorageEngine().writeAllState();



                    mLogger.log(getJobStats());

                    mLogger.log("Shutting down.");

                    mLogger.log("Shutting down.");

                }

                }

            };

            };
@@ -504,13 +514,11 @@ public class SyncManager { 
                    }

                    }

                }

                }

            }

            }

            final int totalJobs = (mJobSchedulerInternal == null)

                    ? -1 : mJobSchedulerInternal.countJobs();

            final String summary = "Loaded persisted syncs: "

            final String summary = "Loaded persisted syncs: "

                    + numPersistedPeriodicSyncs + " periodic syncs, "

                    + numPersistedPeriodicSyncs + " periodic syncs, "

                    + numPersistedOneshotSyncs + " oneshot syncs, "

                    + numPersistedOneshotSyncs + " oneshot syncs, "

                    + (pendingJobs.size()) + " total system server jobs, "

                    + (pendingJobs.size()) + " total system server jobs, "

                    + totalJobs + " total jobs.";

                    + getJobStats();

            Slog.i(TAG, summary);

            Slog.i(TAG, summary);

            mLogger.log(summary);

            mLogger.log(summary);
@@ -720,7 +728,7 @@ public class SyncManager { 
        // the account (they run before) which is the genie is out of the bottle.

        // the account (they run before) which is the genie is out of the bottle.

        whiteListExistingSyncAdaptersIfNeeded();

        whiteListExistingSyncAdaptersIfNeeded();





        mLogger.log("Sync manager initialized.");

        mLogger.log("Sync manager initialized: " + Build.FINGERPRINT);

    }

    }





    public void onStartUser(int userHandle) {

    public void onStartUser(int userHandle) {

services/core/java/com/android/server/job/JobSchedulerInternal.java

+38 −2
Original line number Original line Diff line number Diff line
@@ -38,8 +38,44 @@ public interface JobSchedulerInternal { 
    void removeBackingUpUid(int uid);

    void removeBackingUpUid(int uid);

    void clearAllBackingUpUids();

    void clearAllBackingUpUids();





    JobStorePersistStats getPersistStats();



    /**

    /**

     * @return the total number of jobs across all UIDs.

     * Stats about the first load after boot and the most recent save.

     * STOPSHIP Remove it and the relevant code once b/64536115 is fixed.

     */

     */

    int countJobs();

    public class JobStorePersistStats {

        public int countAllJobsLoaded = -1;

        public int countSystemServerJobsLoaded = -1;

        public int countSystemSyncManagerJobsLoaded = -1;



        public int countAllJobsSaved = -1;

        public int countSystemServerJobsSaved = -1;

        public int countSystemSyncManagerJobsSaved = -1;



        public JobStorePersistStats() {

        }



        public JobStorePersistStats(JobStorePersistStats source) {

            countAllJobsLoaded = source.countAllJobsLoaded;

            countSystemServerJobsLoaded = source.countSystemServerJobsLoaded;

            countSystemSyncManagerJobsLoaded = source.countSystemSyncManagerJobsLoaded;



            countAllJobsSaved = source.countAllJobsSaved;

            countSystemServerJobsSaved = source.countSystemServerJobsSaved;

            countSystemSyncManagerJobsSaved = source.countSystemSyncManagerJobsSaved;

        }



        @Override

        public String toString() {

            return "FirstLoad: "

                    + countAllJobsLoaded + "/"

                    + countSystemServerJobsLoaded + "/"

                    + countSystemSyncManagerJobsLoaded

                    + " LastSave: "

                    + countAllJobsSaved + "/"

                    + countSystemServerJobsSaved + "/"

                    + countSystemSyncManagerJobsSaved;

        }

    }

}
 
}

services/core/java/com/android/server/job/JobSchedulerService.java

+10 −9
Original line number Original line Diff line number Diff line
@@ -782,6 +782,11 @@ public final class JobSchedulerService extends com.android.server.SystemService 
     *

     *

     */

     */

    public void cancelJobsForUid(int uid, String reason) {

    public void cancelJobsForUid(int uid, String reason) {

        if (uid == Process.SYSTEM_UID) {

            // This really shouldn't happen.

            Slog.wtfStack(TAG, "cancelJobsForUid() called for system uid");

            return;

        }

        synchronized (mLock) {

        synchronized (mLock) {

            final List<JobStatus> jobsForUid = mJobs.getJobsByUid(uid);

            final List<JobStatus> jobsForUid = mJobs.getJobsByUid(uid);

            for (int i=0; i<jobsForUid.size(); i++) {

            for (int i=0; i<jobsForUid.size(); i++) {
@@ -1837,9 +1842,9 @@ public final class JobSchedulerService extends com.android.server.SystemService 
        }

        }





        @Override

        @Override

        public int countJobs() {

        public JobStorePersistStats getPersistStats() {

            synchronized (mLock) {

            synchronized (mLock) {

                return mJobs.size();

                return new JobStorePersistStats(mJobs.getPersistStats());

            }

            }

        }

        }

    }

    }
@@ -2022,13 +2027,6 @@ public final class JobSchedulerService extends com.android.server.SystemService 
        @Override

        @Override

        public void cancelAll() throws RemoteException {

        public void cancelAll() throws RemoteException {

            final int uid = Binder.getCallingUid();

            final int uid = Binder.getCallingUid();

            switch (uid) {

                case Process.SYSTEM_UID:

                    // This really shouldn't happen.

                    Slog.wtf(TAG, "JobScheduler.cancelAll() called for uid=" + uid);

                    return;

            }



            long ident = Binder.clearCallingIdentity();

            long ident = Binder.clearCallingIdentity();

            try {

            try {

                JobSchedulerService.this.cancelJobsForUid(uid, "cancelAll() called by app");

                JobSchedulerService.this.cancelJobsForUid(uid, "cancelAll() called by app");
@@ -2470,6 +2468,9 @@ public final class JobSchedulerService extends com.android.server.SystemService 
                pw.print("mReportedActive="); pw.println(mReportedActive);

                pw.print("mReportedActive="); pw.println(mReportedActive);

                pw.print("mMaxActiveJobs="); pw.println(mMaxActiveJobs);

                pw.print("mMaxActiveJobs="); pw.println(mMaxActiveJobs);

            }

            }

            pw.println();

            pw.print("PersistStats: ");

            pw.println(mJobs.getPersistStats());

        }

        }

        pw.println();

        pw.println();

    }

    }

services/core/java/com/android/server/job/JobStore.java

+43 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.os.Environment;

import android.os.Environment;

import android.os.Handler;

import android.os.Handler;

import android.os.PersistableBundle;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserHandle;

import android.text.format.DateUtils;

import android.text.format.DateUtils;
@@ -38,6 +39,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.FastXmlSerializer;

import com.android.server.IoThread;

import com.android.server.IoThread;

import com.android.server.job.JobSchedulerInternal.JobStorePersistStats;

import com.android.server.job.controllers.JobStatus;

import com.android.server.job.controllers.JobStatus;





import java.io.ByteArrayOutputStream;

import java.io.ByteArrayOutputStream;
@@ -89,6 +91,8 @@ public final class JobStore { 
    private final Handler mIoHandler = IoThread.getHandler();

    private final Handler mIoHandler = IoThread.getHandler();

    private static JobStore sSingleton;

    private static JobStore sSingleton;





    private JobStorePersistStats mPersistInfo = new JobStorePersistStats();



    /** Used by the {@link JobSchedulerService} to instantiate the JobStore. */

    /** Used by the {@link JobSchedulerService} to instantiate the JobStore. */

    static JobStore initAndGet(JobSchedulerService jobManagerService) {

    static JobStore initAndGet(JobSchedulerService jobManagerService) {

        synchronized (sSingletonLock) {

        synchronized (sSingletonLock) {
@@ -199,6 +203,10 @@ public final class JobStore { 
        return mJobSet.size();

        return mJobSet.size();

    }

    }





    public JobStorePersistStats getPersistStats() {

        return mPersistInfo;

    }



    public int countJobsForUid(int uid) {

    public int countJobsForUid(int uid) {

        return mJobSet.countJobsForUid(uid);

        return mJobSet.countJobsForUid(uid);

    }

    }
@@ -336,6 +344,9 @@ public final class JobStore { 
        }

        }





        private void writeJobsMapImpl(List<JobStatus> jobList) {

        private void writeJobsMapImpl(List<JobStatus> jobList) {

            int numJobs = 0;

            int numSystemJobs = 0;

            int numSyncJobs = 0;

            try {

            try {

                ByteArrayOutputStream baos = new ByteArrayOutputStream();

                ByteArrayOutputStream baos = new ByteArrayOutputStream();

                XmlSerializer out = new FastXmlSerializer();

                XmlSerializer out = new FastXmlSerializer();
@@ -356,6 +367,14 @@ public final class JobStore { 
                    writeExecutionCriteriaToXml(out, jobStatus);

                    writeExecutionCriteriaToXml(out, jobStatus);

                    writeBundleToXml(jobStatus.getJob().getExtras(), out);

                    writeBundleToXml(jobStatus.getJob().getExtras(), out);

                    out.endTag(null, "job");

                    out.endTag(null, "job");



                    numJobs++;

                    if (jobStatus.getUid() == Process.SYSTEM_UID) {

                        numSystemJobs++;

                        if (isSyncJob(jobStatus)) {

                            numSyncJobs++;

                        }

                    }

                }

                }

                out.endTag(null, "job-info");

                out.endTag(null, "job-info");

                out.endDocument();

                out.endDocument();
@@ -373,6 +392,10 @@ public final class JobStore { 
                if (DEBUG) {

                if (DEBUG) {

                    Slog.d(TAG, "Error persisting bundle.", e);

                    Slog.d(TAG, "Error persisting bundle.", e);

                }

                }

            } finally {

                mPersistInfo.countAllJobsSaved = numJobs;

                mPersistInfo.countSystemServerJobsSaved = numSystemJobs;

                mPersistInfo.countSystemSyncManagerJobsSaved = numSyncJobs;

            }

            }

        }

        }
@@ -525,6 +548,11 @@ public final class JobStore { 
        return Pair.create(earliest, latest);

        return Pair.create(earliest, latest);

    }

    }





    private static boolean isSyncJob(JobStatus status) {

        return com.android.server.content.SyncJobService.class.getName()

                .equals(status.getServiceComponent().getClassName());

    }



    /**

    /**

     * Runnable that reads list of persisted job from xml. This is run once at start up, so doesn't

     * Runnable that reads list of persisted job from xml. This is run once at start up, so doesn't

     * need to go through {@link JobStore#add(com.android.server.job.controllers.JobStatus)}.

     * need to go through {@link JobStore#add(com.android.server.job.controllers.JobStatus)}.
@@ -545,6 +573,8 @@ public final class JobStore { 
        @Override

        @Override

        public void run() {

        public void run() {

            int numJobs = 0;

            int numJobs = 0;

            int numSystemJobs = 0;

            int numSyncJobs = 0;

            try {

            try {

                List<JobStatus> jobs;

                List<JobStatus> jobs;

                FileInputStream fis = mJobsFile.openRead();

                FileInputStream fis = mJobsFile.openRead();
@@ -558,7 +588,14 @@ public final class JobStore { 
                            js.prepareLocked(am);

                            js.prepareLocked(am);

                            js.enqueueTime = now;

                            js.enqueueTime = now;

                            this.jobSet.add(js);

                            this.jobSet.add(js);



                            numJobs++;

                            numJobs++;

                            if (js.getUid() == Process.SYSTEM_UID) {

                                numSystemJobs++;

                                if (isSyncJob(js)) {

                                    numSyncJobs++;

                                }

                            }

                        }

                        }

                    }

                    }

                }

                }
@@ -569,6 +606,12 @@ public final class JobStore { 
                }

                }

            } catch (XmlPullParserException | IOException e) {

            } catch (XmlPullParserException | IOException e) {

                Slog.wtf(TAG, "Error jobstore xml.", e);

                Slog.wtf(TAG, "Error jobstore xml.", e);

            } finally {

                if (mPersistInfo.countAllJobsLoaded < 0) { // Only set them once.

                    mPersistInfo.countAllJobsLoaded = numJobs;

                    mPersistInfo.countSystemServerJobsLoaded = numSystemJobs;

                    mPersistInfo.countSystemSyncManagerJobsLoaded = numSyncJobs;

                }

            }

            }

            Slog.i(TAG, "Read " + numJobs + " jobs");

            Slog.i(TAG, "Read " + numJobs + " jobs");

        }

        }