diff options
| -rw-r--r-- | .clang-format | 12 | ||||
| -rw-r--r-- | PREUPLOAD.cfg | 5 | ||||
| -rw-r--r-- | jni/FuseDaemon.cpp | 80 | ||||
| -rw-r--r-- | jni/FuseDaemon.h | 3 | ||||
| -rw-r--r-- | jni/com_android_providers_media_FuseDaemon.cpp | 24 | ||||
| -rw-r--r-- | jni/jni_init.cpp | 7 |
6 files changed, 70 insertions, 61 deletions
diff --git a/.clang-format b/.clang-format new file mode 100644 index 000000000..912716375 --- /dev/null +++ b/.clang-format @@ -0,0 +1,12 @@ +BasedOnStyle: Google +AccessModifierOffset: -2 +AllowShortFunctionsOnASingleLine: Inline +ColumnLimit: 100 +CommentPragmas: NOLINT:.* +DerivePointerAlignment: false +IndentWidth: 4 +ContinuationIndentWidth: 8 +PointerAlignment: Left +TabWidth: 4 +UseTab: Never +PenaltyExcessCharacter: 32 diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 000000000..c8dbf77fa --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,5 @@ +[Builtin Hooks] +clang_format = true + +[Builtin Hooks Options] +clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp index 4ce8b1f74..61d0615b8 100644 --- a/jni/FuseDaemon.cpp +++ b/jni/FuseDaemon.cpp @@ -16,13 +16,13 @@ #include "FuseDaemon.h" -#include <fuse_i.h> -#include <fuse_lowlevel.h> - +#include <android/log.h> #include <ctype.h> #include <dirent.h> #include <errno.h> #include <fcntl.h> +#include <fuse_i.h> +#include <fuse_lowlevel.h> #include <inttypes.h> #include <limits.h> #include <linux/fuse.h> @@ -42,9 +42,8 @@ #include <sys/types.h> #include <sys/uio.h> #include <unistd.h> -#include <iostream> -#include <android/log.h> +#include <iostream> using std::string; @@ -322,10 +321,9 @@ namespace fuse { static void pf_init(void* userdata, struct fuse_conn_info* conn) { // We don't want a getattr request with every read request conn->want &= ~FUSE_CAP_AUTO_INVAL_DATA; - unsigned mask = - (FUSE_CAP_SPLICE_WRITE | FUSE_CAP_SPLICE_MOVE | FUSE_CAP_SPLICE_READ - | FUSE_CAP_ASYNC_READ | FUSE_CAP_ATOMIC_O_TRUNC | FUSE_CAP_WRITEBACK_CACHE - | FUSE_CAP_EXPORT_SUPPORT | FUSE_CAP_FLOCK_LOCKS); + unsigned mask = (FUSE_CAP_SPLICE_WRITE | FUSE_CAP_SPLICE_MOVE | FUSE_CAP_SPLICE_READ | + FUSE_CAP_ASYNC_READ | FUSE_CAP_ATOMIC_O_TRUNC | FUSE_CAP_WRITEBACK_CACHE | + FUSE_CAP_EXPORT_SUPPORT | FUSE_CAP_FLOCK_LOCKS); conn->want |= conn->capable & mask; } @@ -1167,36 +1165,35 @@ static void pf_fallocate(fuse_req_t req, fuse_ino_t ino, int mode, */ static struct fuse_lowlevel_ops ops{ - .init = pf_init, - /*.destroy = pf_destroy,*/ - .lookup = pf_lookup, .forget = pf_forget, .forget_multi = pf_forget_multi, - .getattr = pf_getattr, .setattr = pf_setattr, - /*.readlink = pf_readlink,*/ - .mknod = pf_mknod, .mkdir = pf_mkdir, .unlink = pf_unlink, .rmdir = pf_rmdir, - /*.symlink = pf_symlink,*/ - .rename = pf_rename, - /*.link = pf_link,*/ - .open = pf_open, .read = pf_read, - /*.write = pf_write,*/ - .write_buf = pf_write_buf, - /*.copy_file_range = pf_copy_file_range,*/ - .flush = pf_flush, .release = pf_release, .fsync = pf_fsync, .fsyncdir = pf_fsyncdir, - .opendir = pf_opendir, .readdir = pf_readdir, .readdirplus = pf_readdirplus, - .releasedir = pf_releasedir, .statfs = pf_statfs, - /*.setxattr = pf_setxattr, - .getxattr = pf_getxattr, - .listxattr = pf_listxattr, - .removexattr = pf_removexattr,*/ - .access = pf_access, - .create = pf_create, - /*.getlk = pf_getlk, - .setlk = pf_setlk, - .bmap = pf_bmap, - .ioctl = pf_ioctl, - .poll = pf_poll, - .retrieve_reply = pf_retrieve_reply,*/ - /*.flock = pf_flock, - .fallocate = pf_fallocate,*/ + .init = pf_init, + /*.destroy = pf_destroy,*/ + .lookup = pf_lookup, .forget = pf_forget, .forget_multi = pf_forget_multi, + .getattr = pf_getattr, .setattr = pf_setattr, + /*.readlink = pf_readlink,*/ + .mknod = pf_mknod, .mkdir = pf_mkdir, .unlink = pf_unlink, .rmdir = pf_rmdir, + /*.symlink = pf_symlink,*/ + .rename = pf_rename, + /*.link = pf_link,*/ + .open = pf_open, .read = pf_read, + /*.write = pf_write,*/ + .write_buf = pf_write_buf, + /*.copy_file_range = pf_copy_file_range,*/ + .flush = pf_flush, .release = pf_release, .fsync = pf_fsync, .fsyncdir = pf_fsyncdir, + .opendir = pf_opendir, .readdir = pf_readdir, .readdirplus = pf_readdirplus, + .releasedir = pf_releasedir, .statfs = pf_statfs, + /*.setxattr = pf_setxattr, + .getxattr = pf_getxattr, + .listxattr = pf_listxattr, + .removexattr = pf_removexattr,*/ + .access = pf_access, .create = pf_create, + /*.getlk = pf_getlk, + .setlk = pf_setlk, + .bmap = pf_bmap, + .ioctl = pf_ioctl, + .poll = pf_poll, + .retrieve_reply = pf_retrieve_reply,*/ + /*.flock = pf_flock, + .fallocate = pf_fallocate,*/ }; static struct fuse_loop_config config = { @@ -1228,8 +1225,7 @@ void FuseDaemon::Start(const int fd, const std::string& dest_path, const std::st } args = FUSE_ARGS_INIT(0, nullptr); - if (fuse_opt_add_arg(&args, source_path.c_str()) - || fuse_opt_add_arg(&args, "-odebug")) { + if (fuse_opt_add_arg(&args, source_path.c_str()) || fuse_opt_add_arg(&args, "-odebug")) { ALOGE("ERROR: failed to set options\n"); return; } @@ -1268,4 +1264,4 @@ void FuseDaemon::Start(const int fd, const std::string& dest_path, const std::st return; } } //namespace fuse -} //namespace mediaprovider +} // namespace mediaprovider diff --git a/jni/FuseDaemon.h b/jni/FuseDaemon.h index ce6e1f5f6..68b4423b4 100644 --- a/jni/FuseDaemon.h +++ b/jni/FuseDaemon.h @@ -39,7 +39,8 @@ public: * Stop the FUSE daemon and clean up resources. */ void Stop(); -private: + + private: FuseDaemon(const FuseDaemon&) = delete; void operator=(const FuseDaemon&) = delete; }; diff --git a/jni/com_android_providers_media_FuseDaemon.cpp b/jni/com_android_providers_media_FuseDaemon.cpp index 394dd8581..003f10e4b 100644 --- a/jni/com_android_providers_media_FuseDaemon.cpp +++ b/jni/com_android_providers_media_FuseDaemon.cpp @@ -17,12 +17,12 @@ // Need to use LOGE_EX. #define LOG_TAG "FuseDaemon" -#include "FuseDaemon.h" -#include "android-base/logging.h" +#include <nativehelper/scoped_utf_chars.h> #include <string> -#include <nativehelper/scoped_utf_chars.h> +#include "FuseDaemon.h" +#include "android-base/logging.h" namespace mediaprovider { namespace { @@ -30,15 +30,14 @@ namespace { constexpr const char* CLASS_NAME = "com/android/providers/media/fuse/FuseDaemon"; static jclass gFuseDaemonClass; -jlong com_android_providers_media_FuseDaemon_new(JNIEnv* env, jobject self, - jobject mediaProvider) { +jlong com_android_providers_media_FuseDaemon_new(JNIEnv* env, jobject self, jobject mediaProvider) { LOG(DEBUG) << "Creating the FUSE daemon..."; return reinterpret_cast<jlong>(new fuse::FuseDaemon(env, mediaProvider)); } -void com_android_providers_media_FuseDaemon_start( - JNIEnv* env, jobject self, jlong java_daemon, jint fd, jstring java_upper_path, - jstring java_lower_path) { +void com_android_providers_media_FuseDaemon_start(JNIEnv* env, jobject self, jlong java_daemon, + jint fd, jstring java_upper_path, + jstring java_lower_path) { LOG(DEBUG) << "Starting the FUSE daemon..."; fuse::FuseDaemon* const daemon = reinterpret_cast<fuse::FuseDaemon*>(java_daemon); @@ -57,15 +56,13 @@ void com_android_providers_media_FuseDaemon_start( daemon->Start(fd, string_upper_path, string_lower_path); } -void com_android_providers_media_FuseDaemon_stop( - JNIEnv* env, jobject self, jlong java_daemon) { +void com_android_providers_media_FuseDaemon_stop(JNIEnv* env, jobject self, jlong java_daemon) { LOG(DEBUG) << "Stopping the FUSE daemon..."; fuse::FuseDaemon* const daemon = reinterpret_cast<fuse::FuseDaemon*>(java_daemon); daemon->Stop(); } -void com_android_providers_media_FuseDaemon_delete( - JNIEnv* env, jobject self, jlong java_daemon) { +void com_android_providers_media_FuseDaemon_delete(JNIEnv* env, jobject self, jlong java_daemon) { LOG(DEBUG) << "Destroying the FUSE daemon..."; fuse::FuseDaemon* const daemon = reinterpret_cast<fuse::FuseDaemon*>(java_daemon); delete daemon; @@ -102,8 +99,7 @@ void register_android_providers_media_FuseDaemon(JNIEnv* env) { LOG(FATAL) << "Unable to find class : " << CLASS_NAME; } - if (env->RegisterNatives( - gFuseDaemonClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { + if (env->RegisterNatives(gFuseDaemonClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { LOG(FATAL) << "Unable to register native methods"; } } diff --git a/jni/jni_init.cpp b/jni/jni_init.cpp index 1d96f6715..6ce1a906b 100644 --- a/jni/jni_init.cpp +++ b/jni/jni_init.cpp @@ -16,16 +16,15 @@ #define LOG_TAG "FuseDaemon" -#include "jni.h" - #include "android-base/logging.h" +#include "jni.h" namespace mediaprovider { - int register_android_providers_media_FuseDaemon(JNIEnv* env); +int register_android_providers_media_FuseDaemon(JNIEnv* env); } extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { - JNIEnv *env; + JNIEnv* env; if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { LOG(ERROR) << "ERROR: GetEnv failed"; return JNI_ERR; |