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

Commit d65f2a02 authored by Connor O'Brien's avatar Connor O'Brien Committed by Steven Moreland
Browse files

libtimeinstate: move map format info into shared header 



Switch from using timeinstate.h to a shared header in system/bpf that
provides key & value struct definitions both to libtimeinstate and to
our BPF program

Test: build libtimeinstate
Bug: 138317993
Change-Id: I302b40bd1dfa7b529888f598cf36c146400f1315
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
(cherry picked from commit b2b50307)
Merged-In: I302b40bd1dfa7b529888f598cf36c146400f1315
parent 26de80f7

libs/cputimeinstate/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ cc_library { 
        "liblog",

        "libnetdutils"

    ],

    header_libs: ["bpf_prog_headers"],

    cflags: [

        "-Werror",

        "-Wall",
@@ -25,6 +26,7 @@ cc_test { 
        "libtimeinstate",

        "libnetdutils",

    ],

    header_libs: ["bpf_prog_headers"],

    cflags: [

        "-Werror",

        "-Wall",

libs/cputimeinstate/cputimeinstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "libtimeinstate"



#include "cputimeinstate.h"

#include "timeinstate.h"

#include <bpf_timeinstate.h>



#include <dirent.h>

#include <errno.h>

libs/cputimeinstate/testtimeinstate.cpp

+1 −1
Original line number Diff line number Diff line 


#include "timeinstate.h"

#include <bpf_timeinstate.h>



#include <sys/sysinfo.h>

libs/cputimeinstate/timeinstate.h

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <inttypes.h>



#define BPF_FS_PATH "/sys/fs/bpf/"



#define FREQS_PER_ENTRY 32

#define CPUS_PER_ENTRY 8



struct time_key_t {

    uint32_t uid;

    uint32_t bucket;

};



struct tis_val_t {

    uint64_t ar[FREQS_PER_ENTRY];

};



struct concurrent_val_t {

    uint64_t active[CPUS_PER_ENTRY];

    uint64_t policy[CPUS_PER_ENTRY];

};



struct freq_idx_key_t {

    uint32_t policy;

    uint32_t freq;

};