third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vtest: Unify ident size

Browse Source 
Turns out some files managed to have a mix between 2, 3, 4 and tabs for
indenting. The only way to really fix this was to do just a single commit
that fixes all of them.

Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Jakob Bornecrantz <jakob@collabora.com>
macos/master
Jakob Bornecrantz 6 years ago
parent 701c9615d4
commit 21ebb9449b
6 changed files with 576 additions and 503 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      vtest/util.c
  2. 1
      vtest/util.h
  3. 3
      vtest/vtest.h
  4. 1
      vtest/vtest_protocol.h
  5. 137
      vtest/vtest_renderer.c
  6. 19
      vtest/vtest_server.c

6
vtest/util.c
Unescape View File

@ -21,12 +21,14 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
#include "util.h" #include "util.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
int vtest_wait_for_fd_read(int fd) int vtest_wait_for_fd_read(int fd)
{ {
fd_set read_fds; fd_set read_fds;
@ -36,11 +38,13 @@ int vtest_wait_for_fd_read(int fd)
FD_SET(fd, &read_fds); FD_SET(fd, &read_fds);
ret = select(fd + 1, &read_fds, NULL, NULL, NULL); ret = select(fd + 1, &read_fds, NULL, NULL, NULL);
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
if (FD_ISSET(fd, &read_fds)) { if (FD_ISSET(fd, &read_fds)) {
return 0; return 0;
} }
return -1; return -1;
} }

1
vtest/util.h
Unescape View File

@ -21,6 +21,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
#ifndef VTEST_UTIL_H #ifndef VTEST_UTIL_H
#define VTEST_UTIL_H #define VTEST_UTIL_H

3
vtest/vtest.h
Unescape View File

@ -21,10 +21,12 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
#ifndef VTEST_H #ifndef VTEST_H
#define VTEST_H #define VTEST_H
#include <errno.h> #include <errno.h>
int vtest_create_renderer(int in_fd, int out_fd, uint32_t length); int vtest_create_renderer(int in_fd, int out_fd, uint32_t length);
int vtest_send_caps(uint32_t length_dw); int vtest_send_caps(uint32_t length_dw);
@ -49,5 +51,6 @@ int vtest_ping_protocol_version(uint32_t length_dw);
int vtest_protocol_version(uint32_t length_dw); int vtest_protocol_version(uint32_t length_dw);
void vtest_destroy_renderer(void); void vtest_destroy_renderer(void);
#endif #endif

1
vtest/vtest_protocol.h
Unescape View File

@ -21,6 +21,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
#ifndef VTEST_PROTOCOL #ifndef VTEST_PROTOCOL
#define VTEST_PROTOCOL #define VTEST_PROTOCOL

137
vtest/vtest_renderer.c
Unescape View File

@ -21,6 +21,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -39,6 +40,7 @@
#include "util/u_memory.h" #include "util/u_memory.h"
#include "util/u_hash_table.h" #include "util/u_hash_table.h"
static int ctx_id = 1; static int ctx_id = 1;
static int fence_id = 1; static int fence_id = 1;
@ -97,12 +99,13 @@ hash_func(void *key)
static int static int
compare_iovecs(void *key1, void *key2) compare_iovecs(void *key1, void *key2)
{ {
if (key1 < key2) if (key1 < key2) {
return -1; return -1;
if (key1 > key2) } else if (key1 > key2) {
return 1; return 1;
else } else {
return 0; return 0;
}
} }
static void free_iovec(void *value) static void free_iovec(void *value)
@ -119,13 +122,17 @@ static int vtest_block_write(int fd, void *buf, int size)
int left; int left;
int ret; int ret;
left = size; left = size;
do { do {
ret = write(fd, ptr, left); ret = write(fd, ptr, left);
if (ret < 0) if (ret < 0) {
return -errno; return -errno;
}
left -= ret; left -= ret;
ptr += ret; ptr += ret;
} while (left); } while (left);
return size; return size;
} }
@ -135,12 +142,16 @@ static int vtest_block_write_zero(int fd, int size)
int left; int left;
int ret; int ret;
left = size; left = size;
do { do {
ret = write(fd, zero, MIN2(left, 256)); ret = write(fd, zero, MIN2(left, 256));
if (ret < 0) if (ret < 0) {
return -errno; return -errno;
}
left -= ret; left -= ret;
} while (left); } while (left);
return size; return size;
} }
@ -154,11 +165,14 @@ int vtest_block_read(int fd, void *buf, int size)
left = size; left = size;
do { do {
ret = read(fd, ptr, left); ret = read(fd, ptr, left);
if (ret <= 0) if (ret <= 0) {
return ret == -1 ? -errno : 0; return ret == -1 ? -errno : 0;
}
left -= ret; left -= ret;
ptr += ret; ptr += ret;
} while (left); } while (left);
if (getenv("VTEST_SAVE")) { if (getenv("VTEST_SAVE")) {
if (savefd == -1) { if (savefd == -1) {
savefd = open(getenv("VTEST_SAVE"), savefd = open(getenv("VTEST_SAVE"),
@ -173,6 +187,7 @@ int vtest_block_read(int fd, void *buf, int size)
exit(1); exit(1);
} }
} }
return size; return size;
} }
@ -189,8 +204,9 @@ int vtest_create_renderer(int in_fd, int out_fd, uint32_t length)
/* By default we support version 0 unless VCMD_PROTOCOL_VERSION is sent */ /* By default we support version 0 unless VCMD_PROTOCOL_VERSION is sent */
renderer.protocol_version = 0; renderer.protocol_version = 0;
if (getenv("VTEST_USE_GLX")) if (getenv("VTEST_USE_GLX")) {
ctx = VIRGL_RENDERER_USE_GLX; ctx = VIRGL_RENDERER_USE_GLX;
}
if (getenv("VTEST_USE_EGL_SURFACELESS")) { if (getenv("VTEST_USE_EGL_SURFACELESS")) {
if (ctx & VIRGL_RENDERER_USE_GLX) { if (ctx & VIRGL_RENDERER_USE_GLX) {
@ -216,8 +232,9 @@ int vtest_create_renderer(int in_fd, int out_fd, uint32_t length)
} }
vtestname = calloc(1, length + 1); vtestname = calloc(1, length + 1);
if (!vtestname) if (!vtestname) {
return -1; return -1;
}
ret = vtest_block_read(renderer.in_fd, vtestname, length); ret = vtest_block_read(renderer.in_fd, vtestname, length);
if (ret != (int)length) { if (ret != (int)length) {
@ -240,8 +257,10 @@ int vtest_ping_protocol_version(UNUSED uint32_t length_dw)
hdr_buf[VTEST_CMD_LEN] = VCMD_PING_PROTOCOL_VERSION_SIZE; hdr_buf[VTEST_CMD_LEN] = VCMD_PING_PROTOCOL_VERSION_SIZE;
hdr_buf[VTEST_CMD_ID] = VCMD_PING_PROTOCOL_VERSION; hdr_buf[VTEST_CMD_ID] = VCMD_PING_PROTOCOL_VERSION;
ret = vtest_block_write(renderer.out_fd, hdr_buf, sizeof(hdr_buf)); ret = vtest_block_write(renderer.out_fd, hdr_buf, sizeof(hdr_buf));
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
return 0; return 0;
} }
@ -264,12 +283,14 @@ int vtest_protocol_version(UNUSED uint32_t length_dw)
version_buf[VCMD_PROTOCOL_VERSION_VERSION] = renderer.protocol_version; version_buf[VCMD_PROTOCOL_VERSION_VERSION] = renderer.protocol_version;
ret = vtest_block_write(renderer.out_fd, hdr_buf, sizeof(hdr_buf)); ret = vtest_block_write(renderer.out_fd, hdr_buf, sizeof(hdr_buf));
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
ret = vtest_block_write(renderer.out_fd, version_buf, sizeof(version_buf)); ret = vtest_block_write(renderer.out_fd, version_buf, sizeof(version_buf));
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
return 0; return 0;
} }
@ -291,22 +312,28 @@ int vtest_send_caps2(UNUSED uint32_t length_dw)
virgl_renderer_get_cap_set(2, &max_ver, &max_size); virgl_renderer_get_cap_set(2, &max_ver, &max_size);
if (max_size == 0) if (max_size == 0) {
return -1; return -1;
}
caps_buf = malloc(max_size); caps_buf = malloc(max_size);
if (!caps_buf) if (!caps_buf) {
return -1; return -1;
}
virgl_renderer_fill_caps(2, 1, caps_buf); virgl_renderer_fill_caps(2, 1, caps_buf);
hdr_buf[0] = max_size + 1; hdr_buf[0] = max_size + 1;
hdr_buf[1] = 2; hdr_buf[1] = 2;
ret = vtest_block_write(renderer.out_fd, hdr_buf, 8); ret = vtest_block_write(renderer.out_fd, hdr_buf, 8);
if (ret < 0) if (ret < 0) {
goto end; goto end;
}
vtest_block_write(renderer.out_fd, caps_buf, max_size); vtest_block_write(renderer.out_fd, caps_buf, max_size);
if (ret < 0) if (ret < 0) {
goto end; goto end;
}
end: end:
free(caps_buf); free(caps_buf);
@ -323,19 +350,23 @@ int vtest_send_caps(UNUSED uint32_t length_dw)
virgl_renderer_get_cap_set(1, &max_ver, &max_size); virgl_renderer_get_cap_set(1, &max_ver, &max_size);
caps_buf = malloc(max_size); caps_buf = malloc(max_size);
if (!caps_buf) if (!caps_buf) {
return -1; return -1;
}
virgl_renderer_fill_caps(1, 1, caps_buf); virgl_renderer_fill_caps(1, 1, caps_buf);
hdr_buf[0] = max_size + 1; hdr_buf[0] = max_size + 1;
hdr_buf[1] = 1; hdr_buf[1] = 1;
ret = vtest_block_write(renderer.out_fd, hdr_buf, 8); ret = vtest_block_write(renderer.out_fd, hdr_buf, 8);
if (ret < 0) if (ret < 0) {
goto end; goto end;
}
vtest_block_write(renderer.out_fd, caps_buf, max_size); vtest_block_write(renderer.out_fd, caps_buf, max_size);
if (ret < 0) if (ret < 0) {
goto end; goto end;
}
end: end:
free(caps_buf); free(caps_buf);
@ -349,8 +380,9 @@ int vtest_create_resource(UNUSED uint32_t length_dw)
int ret; int ret;
ret = vtest_block_read(renderer.in_fd, &res_create_buf, sizeof(res_create_buf)); ret = vtest_block_read(renderer.in_fd, &res_create_buf, sizeof(res_create_buf));
if (ret != sizeof(res_create_buf)) if (ret != sizeof(res_create_buf)) {
return -1; return -1;
}
args.handle = res_create_buf[VCMD_RES_CREATE_RES_HANDLE]; args.handle = res_create_buf[VCMD_RES_CREATE_RES_HANDLE];
args.target = res_create_buf[VCMD_RES_CREATE_TARGET]; args.target = res_create_buf[VCMD_RES_CREATE_TARGET];
@ -379,8 +411,9 @@ int vtest_create_resource2(UNUSED uint32_t length_dw)
int ret; int ret;
ret = vtest_block_read(renderer.in_fd, &res_create_buf, sizeof(res_create_buf)); ret = vtest_block_read(renderer.in_fd, &res_create_buf, sizeof(res_create_buf));
if (ret != sizeof(res_create_buf)) if (ret != sizeof(res_create_buf)) {
return -1; return -1;
}
args.handle = res_create_buf[VCMD_RES_CREATE2_RES_HANDLE]; args.handle = res_create_buf[VCMD_RES_CREATE2_RES_HANDLE];
args.target = res_create_buf[VCMD_RES_CREATE2_TARGET]; args.target = res_create_buf[VCMD_RES_CREATE2_TARGET];
@ -396,23 +429,27 @@ int vtest_create_resource2(UNUSED uint32_t length_dw)
args.flags = 0; args.flags = 0;
// Check that the handle doesn't already exist. // Check that the handle doesn't already exist.
if (util_hash_table_get(renderer.iovec_hash, intptr_to_pointer(args.handle))) if (util_hash_table_get(renderer.iovec_hash, intptr_to_pointer(args.handle))) {
return -EEXIST; return -EEXIST;
}
ret = virgl_renderer_resource_create(&args, NULL, 0); ret = virgl_renderer_resource_create(&args, NULL, 0);
if (ret) if (ret) {
return ret; return ret;
}
virgl_renderer_ctx_attach_resource(ctx_id, args.handle); virgl_renderer_ctx_attach_resource(ctx_id, args.handle);
iovec = CALLOC_STRUCT(iovec); iovec = CALLOC_STRUCT(iovec);
if (!iovec) if (!iovec) {
return -ENOMEM; return -ENOMEM;
}
iovec->iov_len = res_create_buf[VCMD_RES_CREATE2_DATA_SIZE]; iovec->iov_len = res_create_buf[VCMD_RES_CREATE2_DATA_SIZE];
iovec->iov_base = calloc(1, iovec->iov_len); iovec->iov_base = calloc(1, iovec->iov_len);
if (!iovec->iov_base) if (!iovec->iov_base) {
return -ENOMEM; return -ENOMEM;
}
virgl_renderer_resource_attach_iov(args.handle, iovec, 1); virgl_renderer_resource_attach_iov(args.handle, iovec, 1);
util_hash_table_set(renderer.iovec_hash, intptr_to_pointer(args.handle), iovec); util_hash_table_set(renderer.iovec_hash, intptr_to_pointer(args.handle), iovec);
@ -427,8 +464,9 @@ int vtest_resource_unref(UNUSED uint32_t length_dw)
uint32_t handle; uint32_t handle;
ret = vtest_block_read(renderer.in_fd, &res_unref_buf, sizeof(res_unref_buf)); ret = vtest_block_read(renderer.in_fd, &res_unref_buf, sizeof(res_unref_buf));
if (ret != sizeof(res_unref_buf)) if (ret != sizeof(res_unref_buf)) {
return -1; return -1;
}
handle = res_unref_buf[VCMD_RES_UNREF_RES_HANDLE]; handle = res_unref_buf[VCMD_RES_UNREF_RES_HANDLE];
virgl_renderer_ctx_attach_resource(ctx_id, handle); virgl_renderer_ctx_attach_resource(ctx_id, handle);
@ -445,12 +483,14 @@ int vtest_submit_cmd(uint32_t length_dw)
uint32_t *cbuf; uint32_t *cbuf;
int ret; int ret;
if (length_dw > UINT_MAX / 4) if (length_dw > UINT_MAX / 4) {
return -1; return -1;
}
cbuf = malloc(length_dw * 4); cbuf = malloc(length_dw * 4);
if (!cbuf) if (!cbuf) {
return -1; return -1;
}
ret = vtest_block_read(renderer.in_fd, cbuf, length_dw * 4); ret = vtest_block_read(renderer.in_fd, cbuf, length_dw * 4);
if (ret != (int)length_dw * 4) { if (ret != (int)length_dw * 4) {
@ -492,14 +532,16 @@ int vtest_transfer_get(UNUSED uint32_t length_dw)
struct iovec iovec; struct iovec iovec;
ret = vtest_block_read(renderer.in_fd, thdr_buf, VCMD_TRANSFER_HDR_SIZE * 4); ret = vtest_block_read(renderer.in_fd, thdr_buf, VCMD_TRANSFER_HDR_SIZE * 4);
if (ret != VCMD_TRANSFER_HDR_SIZE * 4) if (ret != VCMD_TRANSFER_HDR_SIZE * 4) {
return ret; return ret;
}
DECODE_TRANSFER; DECODE_TRANSFER;
ptr = malloc(data_size); ptr = malloc(data_size);
if (!ptr) if (!ptr) {
return -ENOMEM; return -ENOMEM;
}
iovec.iov_len = data_size; iovec.iov_len = data_size;
iovec.iov_base = ptr; iovec.iov_base = ptr;
@ -511,8 +553,10 @@ int vtest_transfer_get(UNUSED uint32_t length_dw)
&box, &box,
0, 0,
&iovec, 1); &iovec, 1);
if (ret) if (ret) {
fprintf(stderr," transfer read failed %d\n", ret); fprintf(stderr," transfer read failed %d\n", ret);
}
ret = vtest_block_write(renderer.out_fd, ptr, data_size); ret = vtest_block_write(renderer.out_fd, ptr, data_size);
free(ptr); free(ptr);
@ -531,18 +575,21 @@ int vtest_transfer_put(UNUSED uint32_t length_dw)
struct iovec iovec; struct iovec iovec;
ret = vtest_block_read(renderer.in_fd, thdr_buf, VCMD_TRANSFER_HDR_SIZE * 4); ret = vtest_block_read(renderer.in_fd, thdr_buf, VCMD_TRANSFER_HDR_SIZE * 4);
if (ret != VCMD_TRANSFER_HDR_SIZE * 4) if (ret != VCMD_TRANSFER_HDR_SIZE * 4) {
return ret; return ret;
}
DECODE_TRANSFER; DECODE_TRANSFER;
ptr = malloc(data_size); ptr = malloc(data_size);
if (!ptr) if (!ptr) {
return -ENOMEM; return -ENOMEM;
}
ret = vtest_block_read(renderer.in_fd, ptr, data_size); ret = vtest_block_read(renderer.in_fd, ptr, data_size);
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
iovec.iov_len = data_size; iovec.iov_len = data_size;
iovec.iov_base = ptr; iovec.iov_base = ptr;
@ -554,8 +601,10 @@ int vtest_transfer_put(UNUSED uint32_t length_dw)
&box, &box,
0, 0,
&iovec, 1); &iovec, 1);
if (ret) if (ret) {
fprintf(stderr," transfer write failed %d\n", ret); fprintf(stderr," transfer write failed %d\n", ret);
}
free(ptr); free(ptr);
return 0; return 0;
} }
@ -650,8 +699,9 @@ int vtest_transfer_put2(UNUSED uint32_t length_dw)
struct iovec *iovec; struct iovec *iovec;
ret = vtest_block_read(renderer.in_fd, thdr_buf, sizeof(thdr_buf)); ret = vtest_block_read(renderer.in_fd, thdr_buf, sizeof(thdr_buf));
if (ret != sizeof(thdr_buf)) if (ret != sizeof(thdr_buf)) {
return ret; return ret;
}
DECODE_TRANSFER2; DECODE_TRANSFER2;
@ -691,22 +741,27 @@ int vtest_resource_busy_wait(UNUSED uint32_t length_dw)
vtest_renderer_create_fence(); vtest_renderer_create_fence();
ret = vtest_block_read(renderer.in_fd, &bw_buf, sizeof(bw_buf)); ret = vtest_block_read(renderer.in_fd, &bw_buf, sizeof(bw_buf));
if (ret != sizeof(bw_buf)) if (ret != sizeof(bw_buf)) {
return -1; return -1;
}
/* handle = bw_buf[VCMD_BUSY_WAIT_HANDLE]; unused as of now */ /* handle = bw_buf[VCMD_BUSY_WAIT_HANDLE]; unused as of now */
flags = bw_buf[VCMD_BUSY_WAIT_FLAGS]; flags = bw_buf[VCMD_BUSY_WAIT_FLAGS];
if (flags == VCMD_BUSY_WAIT_FLAG_WAIT) { if (flags == VCMD_BUSY_WAIT_FLAG_WAIT) {
do { do {
if (last_fence == (fence_id - 1)) if (last_fence == (fence_id - 1)) {
break; break;
}
fd = virgl_renderer_get_poll_fd(); fd = virgl_renderer_get_poll_fd();
if (fd != -1) if (fd != -1) {
vtest_wait_for_fd_read(fd); vtest_wait_for_fd_read(fd);
}
virgl_renderer_poll(); virgl_renderer_poll();
} while (1); } while (1);
busy = false; busy = false;
} else { } else {
busy = last_fence != (fence_id - 1); busy = last_fence != (fence_id - 1);
@ -717,12 +772,14 @@ int vtest_resource_busy_wait(UNUSED uint32_t length_dw)
reply_buf[0] = busy ? 1 : 0; reply_buf[0] = busy ? 1 : 0;
ret = vtest_block_write(renderer.out_fd, hdr_buf, sizeof(hdr_buf)); ret = vtest_block_write(renderer.out_fd, hdr_buf, sizeof(hdr_buf));
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
ret = vtest_block_write(renderer.out_fd, reply_buf, sizeof(reply_buf)); ret = vtest_block_write(renderer.out_fd, reply_buf, sizeof(reply_buf));
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
return 0; return 0;
} }

19
vtest/vtest_server.c
Unescape View File

@ -21,6 +21,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
* *
**************************************************************************/ **************************************************************************/
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>
@ -37,6 +38,7 @@
#include "vtest.h" #include "vtest.h"
#include "vtest_protocol.h" #include "vtest_protocol.h"
static int vtest_open_socket(const char *path) static int vtest_open_socket(const char *path)
{ {
struct sockaddr_un un; struct sockaddr_un un;
@ -63,7 +65,7 @@ static int vtest_open_socket(const char *path)
} }
return sock; return sock;
err: err:
close(sock); close(sock);
return -1; return -1;
} }
@ -77,8 +79,9 @@ static int wait_for_socket_accept(int sock)
FD_SET(sock, &read_fds); FD_SET(sock, &read_fds);
ret = select(sock + 1, &read_fds, NULL, NULL, NULL); ret = select(sock + 1, &read_fds, NULL, NULL, NULL);
if (ret < 0) if (ret < 0) {
return ret; return ret;
}
if (FD_ISSET(sock, &read_fds)) { if (FD_ISSET(sock, &read_fds)) {
new_fd = accept(sock, NULL, NULL); new_fd = accept(sock, NULL, NULL);
@ -229,20 +232,24 @@ start:
case -1: case -1:
default: default:
close(in_fd); close(in_fd);
if (loop) if (loop) {
goto restart; goto restart;
} }
}
} else { } else {
run_renderer(in_fd, out_fd); run_renderer(in_fd, out_fd);
vtest_destroy_renderer(); vtest_destroy_renderer();
if (loop) if (loop) {
goto restart; goto restart;
} }
}
if (sock != -1) if (sock != -1) {
close(sock); close(sock);
if (in_fd != out_fd) }
if (in_fd != out_fd) {
close(out_fd); close(out_fd);
}
#ifdef __AFL_LOOP #ifdef __AFL_LOOP
} }

Write Preview
Loading…
Cancel
Save