TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 10:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use C++ smart pointer for caching su_info

Browse Source
This commit is contained in:
topjohnwu
2019-07-07 00:31:49 -07:00
parent 4f206fd918
commit ab90901793
3 changed files with 67 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
native/jni/su/su.h
View File

@@ -1,44 +1,39 @@
/* su.h - Store all general su info
*/
#pragma once
#ifndef _SU_H_
#define _SU_H_
#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <limits.h>
#include <memory>
#include <db.h>
#define DEFAULT_SHELL "/system/bin/sh"
// Constants for atty
#define ATTY_IN 1
#define ATTY_OUT 2
#define ATTY_ERR 4
#define ATTY_IN (1 << 0)
#define ATTY_OUT (1 << 1)
#define ATTY_ERR (1 << 2)
class su_info {
public:
unsigned uid; /* Unique key to find su_info */
int count; /* Just a count for debugging purpose */
/* Unique key */
const unsigned uid;
/* These values should be guarded with internal lock */
/* These should be guarded with internal lock */
db_settings cfg;
db_strings str;
su_access access;
struct stat mgr_st;
/* These should be guarded with global cache lock */
int ref;
time_t timestamp;
/* This should be guarded with global cache lock */
long timestamp;
su_info(unsigned uid = 0);
~su_info();
void lock();
void unlock();
bool isFresh();
void newRef();
void deRef();
bool is_fresh();
void refresh();
private:
pthread_mutex_t _lock; /* Internal lock */
@@ -60,16 +55,14 @@ struct su_request : public su_req_base {
} __attribute__((packed));
struct su_context {
su_info *info;
std::shared_ptr<su_info> info;
su_request req;
pid_t pid;
};
// connect.c
void app_log(su_context *ctx);
void app_notify(su_context *ctx);
void app_connect(const char *socket, su_info *info);
void socket_send_request(int fd, su_info *info);
#endif
void app_log(const su_context &ctx);
void app_notify(const su_context &ctx);
void app_connect(const char *socket, const std::shared_ptr<su_info> &info);
void socket_send_request(int fd, const std::shared_ptr<su_info> &info);