diff options
author | Erik Gilling <konkers@android.com> | 2012-03-07 15:30:33 -0800 |
---|---|---|
committer | Erik Gilling <konkers@android.com> | 2012-04-18 13:36:17 -0700 |
commit | 196b3a5f6f48649500909c66177967abaf05b898 (patch) | |
tree | 0451a808b8172db8bfdc37afedc335e7cd71f66c | |
parent | 545ab46063f083239b29e59b8b491656d93f2a38 (diff) | |
download | system_core-196b3a5f6f48649500909c66177967abaf05b898.zip system_core-196b3a5f6f48649500909c66177967abaf05b898.tar.gz system_core-196b3a5f6f48649500909c66177967abaf05b898.tar.bz2 |
sync: Add lib sync helper library
Used to talk to kernel synchronization framework
Change-Id: I66e1f4a90f5d58d384bf1cec09db52101f182c5e
Signed-off-by: Erik Gilling <konkers@android.com>
-rw-r--r-- | include/sync/sync.h | 45 | ||||
-rw-r--r-- | libsync/Android.mk | 15 | ||||
-rw-r--r-- | libsync/sync.c | 115 | ||||
-rw-r--r-- | libsync/sync_test.c | 146 |
4 files changed, 321 insertions, 0 deletions
diff --git a/include/sync/sync.h b/include/sync/sync.h new file mode 100644 index 0000000..6aa5f2d --- /dev/null +++ b/include/sync/sync.h @@ -0,0 +1,45 @@ +/* + * 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 <linux/sync.h> +#include <linux/sw_sync.h> + +__BEGIN_DECLS + +/* timeout in msecs */ +int sync_wait(int fd, unsigned 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); + +/* sw_sync is mainly inteded for testing and should not be complied 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_SYNC_H */ diff --git a/libsync/Android.mk b/libsync/Android.mk new file mode 100644 index 0000000..73de069 --- /dev/null +++ b/libsync/Android.mk @@ -0,0 +1,15 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := sync.c +LOCAL_MODULE := libsync +LOCAL_MODULE_TAGS := optional +LOCAL_SHARED_LIBRARIES := liblog +include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := sync.c sync_test.c +LOCAL_MODULE := sync_test +LOCAL_MODULE_TAGS := optional tests +LOCAL_SHARED_LIBRARIES := liblog +include $(BUILD_EXECUTABLE) diff --git a/libsync/sync.c b/libsync/sync.c new file mode 100644 index 0000000..311da14 --- /dev/null +++ b/libsync/sync.c @@ -0,0 +1,115 @@ +/* + * sync.c + * + * 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. + */ + +#include <fcntl.h> +#include <stdint.h> +#include <string.h> + +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include <sync/sync.h> + +int sync_wait(int fd, unsigned int timeout) +{ + __u32 to = timeout; + + return ioctl(fd, SYNC_IOC_WAIT, &to); +} + +int sync_merge(const char *name, int fd1, int fd2) +{ + struct sync_merge_data data; + int err; + + data.fd2 = fd2; + strlcpy(data.name, name, sizeof(data.name)); + + err = ioctl(fd1, SYNC_IOC_MERGE, &data); + if (err < 0) + return err; + + return data.fence; +} + +struct sync_fence_info_data *sync_fence_info(int fd) +{ + struct sync_fence_info_data *info; + int err; + + info = malloc(4096); + if (info == NULL) + return NULL; + + info->len = 4096; + err = ioctl(fd, SYNC_IOC_FENCE_INFO, info); + if (err < 0) { + free(info); + return NULL; + } + + return info; +} + +struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, + struct sync_pt_info *itr) +{ + if (itr == NULL) + itr = (struct sync_pt_info *) info->pt_info; + else + itr = (struct sync_pt_info *) ((__u8 *)itr + itr->len); + + if ((__u8 *)itr - (__u8 *)info >= (int)info->len) + return NULL; + + return itr; +} + +void sync_fence_info_free(struct sync_fence_info_data *info) +{ + free(info); +} + + +int sw_sync_timeline_create(void) +{ + return open("/dev/sw_sync", O_RDWR); +} + +int sw_sync_timeline_inc(int fd, unsigned count) +{ + __u32 arg = count; + + return ioctl(fd, SW_SYNC_IOC_INC, &arg); +} + +int sw_sync_fence_create(int fd, const char *name, unsigned value) +{ + struct sw_sync_create_fence_data data; + int err; + + data.value = value; + strlcpy(data.name, name, sizeof(data.name)); + + err = ioctl(fd, SW_SYNC_IOC_CREATE_FENCE, &data); + if (err < 0) + return err; + + return data.fence; +} diff --git a/libsync/sync_test.c b/libsync/sync_test.c new file mode 100644 index 0000000..a75f671 --- /dev/null +++ b/libsync/sync_test.c @@ -0,0 +1,146 @@ +/* + * sync_test.c + * + * 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. + */ + +#include <errno.h> +#include <pthread.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +#include <sync/sync.h> + +pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; + +struct sync_thread_data { + int thread_no; + int fd[2]; +}; + +void *sync_thread(void *data) +{ + struct sync_thread_data *sync_data = data; + struct sync_fence_info_data *info; + int err; + int i; + + for (i = 0; i < 2; i++) { + err = sync_wait(sync_data->fd[i], 10000); + + pthread_mutex_lock(&printf_mutex); + if (err < 0) { + printf("thread %d wait %d failed: %s\n", sync_data->thread_no, + i, strerror(errno)); + } else { + printf("thread %d wait %d done\n", sync_data->thread_no, i); + } + info = sync_fence_info(sync_data->fd[i]); + if (info) { + struct sync_pt_info *pt_info = NULL; + printf(" fence %s %d\n", info->name, info->status); + + while ((pt_info = sync_pt_info(info, pt_info))) { + int ts_sec = pt_info->timestamp_ns / 1000000000LL; + int ts_usec = (pt_info->timestamp_ns % 1000000000LL) / 1000LL; + printf(" pt %s %s %d %d.%06d", pt_info->obj_name, + pt_info->driver_name, pt_info->status, + ts_sec, ts_usec); + if (!strcmp(pt_info->driver_name, "sw_sync")) + printf(" val=%d\n", *(uint32_t *)pt_info->driver_data); + else + printf("\n"); + } + sync_fence_info_free(info); + } + pthread_mutex_unlock(&printf_mutex); + } + + return NULL; +} + +int main(int argc, char *argv[]) +{ + struct sync_thread_data sync_data[4]; + pthread_t threads[4]; + int sync_timeline_fd; + int i, j; + char str[256]; + + sync_timeline_fd = sw_sync_timeline_create(); + if (sync_timeline_fd < 0) { + perror("can't create sw_sync_timeline:"); + return 1; + } + + for (i = 0; i < 3; i++) { + sync_data[i].thread_no = i; + + for (j = 0; j < 2; j++) { + unsigned val = i + j * 3 + 1; + sprintf(str, "test_fence%d-%d", i, j); + int fd = sw_sync_fence_create(sync_timeline_fd, str, val); + if (fd < 0) { + printf("can't create sync pt %d: %s", val, strerror(errno)); + return 1; + } + sync_data[i].fd[j] = fd; + printf("sync_data[%d].fd[%d] = %d;\n", i, j, fd); + + } + } + + sync_data[3].thread_no = 3; + for (j = 0; j < 2; j++) { + sprintf(str, "merged_fence%d", j); + sync_data[3].fd[j] = sync_merge(str, sync_data[0].fd[j], sync_data[1].fd[j]); + if (sync_data[3].fd[j] < 0) { + printf("can't merge sync pts %d and %d: %s\n", + sync_data[0].fd[j], sync_data[1].fd[j], strerror(errno)); + return 1; + } + } + + for (i = 0; i < 4; i++) + pthread_create(&threads[i], NULL, sync_thread, &sync_data[i]); + + + for (i = 0; i < 3; i++) { + int err; + printf("press enter to inc to %d\n", i+1); + fgets(str, sizeof(str), stdin); + err = sw_sync_timeline_inc(sync_timeline_fd, 1); + if (err < 0) { + perror("can't increment sync obj:"); + return 1; + } + } + + printf("press enter to close sync_timeline\n"); + fgets(str, sizeof(str), stdin); + + close(sync_timeline_fd); + + printf("press enter to end test\n"); + fgets(str, sizeof(str), stdin); + + for (i = 0; i < 3; i++) { + void *val; + pthread_join(threads[i], &val); + } + + return 0; +} |