diff options
author | Rom Lemarchand <romlem@google.com> | 2014-01-02 19:31:53 -0800 |
---|---|---|
committer | Rom Lemarchand <romlem@android.com> | 2014-01-03 21:27:05 +0000 |
commit | ddc20de1483028ee0b4401266499a59631e9d659 (patch) | |
tree | afe715bfbf684fcb3fe9c38b490eb80c857329f6 /libsync | |
parent | f5447b0eb9cd2157f4935477f05d4c92dcda37c8 (diff) | |
download | system_core-ddc20de1483028ee0b4401266499a59631e9d659.zip system_core-ddc20de1483028ee0b4401266499a59631e9d659.tar.gz system_core-ddc20de1483028ee0b4401266499a59631e9d659.tar.bz2 |
move sync headers from include to libsync
Make sw_sync.h private
Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
Diffstat (limited to 'libsync')
-rw-r--r-- | libsync/Android.mk | 3 | ||||
-rw-r--r-- | libsync/include/sync/sync.h | 54 | ||||
-rw-r--r-- | libsync/sw_sync.h | 35 | ||||
-rw-r--r-- | libsync/sync_test.c | 1 |
4 files changed, 93 insertions, 0 deletions
diff --git a/libsync/Android.mk b/libsync/Android.mk index 73de069..626b762 100644 --- a/libsync/Android.mk +++ b/libsync/Android.mk @@ -5,6 +5,8 @@ LOCAL_SRC_FILES := sync.c LOCAL_MODULE := libsync LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := liblog +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -12,4 +14,5 @@ LOCAL_SRC_FILES := sync.c sync_test.c LOCAL_MODULE := sync_test LOCAL_MODULE_TAGS := optional tests LOCAL_SHARED_LIBRARIES := liblog +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include include $(BUILD_EXECUTABLE) diff --git a/libsync/include/sync/sync.h b/libsync/include/sync/sync.h new file mode 100644 index 0000000..2e5d82f --- /dev/null +++ b/libsync/include/sync/sync.h @@ -0,0 +1,54 @@ +/* + * sync.h + * + * Copyright 2012 Google, Inc + * + * 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. + */ + +#ifndef __SYS_CORE_SYNC_H +#define __SYS_CORE_SYNC_H + +#include <sys/cdefs.h> +#include <stdint.h> + +__BEGIN_DECLS + +// XXX: These structs are copied from the header "linux/sync.h". +struct sync_fence_info_data { + uint32_t len; + char name[32]; + int32_t status; + uint8_t pt_info[0]; +}; + +struct sync_pt_info { + uint32_t len; + char obj_name[32]; + char driver_name[32]; + int32_t status; + uint64_t timestamp_ns; + uint8_t driver_data[0]; +}; + +/* timeout in msecs */ +int sync_wait(int fd, int timeout); +int sync_merge(const char *name, int fd1, int fd2); +struct sync_fence_info_data *sync_fence_info(int fd); +struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, + struct sync_pt_info *itr); +void sync_fence_info_free(struct sync_fence_info_data *info); + +__END_DECLS + +#endif /* __SYS_CORE_SYNC_H */ diff --git a/libsync/sw_sync.h b/libsync/sw_sync.h new file mode 100644 index 0000000..fda1c4c --- /dev/null +++ b/libsync/sw_sync.h @@ -0,0 +1,35 @@ +/* + * sw_sync.h + * + * Copyright 2013 Google, Inc + * + * 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. + */ + +#ifndef __SYS_CORE_SW_SYNC_H +#define __SYS_CORE_SW_SYNC_H + +__BEGIN_DECLS + +/* + * sw_sync is mainly intended for testing and should not be compiled into + * production kernels + */ + +int sw_sync_timeline_create(void); +int sw_sync_timeline_inc(int fd, unsigned count); +int sw_sync_fence_create(int fd, const char *name, unsigned value); + +__END_DECLS + +#endif /* __SYS_CORE_SW_SYNC_H */ diff --git a/libsync/sync_test.c b/libsync/sync_test.c index 386747a..ee9ea3c 100644 --- a/libsync/sync_test.c +++ b/libsync/sync_test.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <sync/sync.h> +#include "sw_sync.h" pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; |