diff --git a/.vscode/launch.json b/.vscode/launch.json old mode 100644 new mode 100755 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 diff --git a/.vscode/tasks.json b/.vscode/tasks.json old mode 100644 new mode 100755 diff --git a/Makefile b/Makefile index 3b7b5e2..2ccf412 100755 --- a/Makefile +++ b/Makefile @@ -1,15 +1,16 @@ -voronoi1: main +# Link command: +voronoi1: common.o dcel.o voronoi.o main.o gcc -Wall -Wextra -Werror -pedantic -g -o voronoi1 main.o voronoi.o dcel.o common.o - rm *.o -main: voronoi - gcc -Wall -Wextra -Werror -pedantic -g -o main.o main.c -c +# Compilation commands: +common.o: common.c + gcc -Wall -Wextra -Werror -pedantic -g -o common.o common.c -c -voronoi: dcel - gcc -Wall -Wextra -Werror -pedantic -g -o voronoi.o voronoi.c -c - -dcel: common +dcel.o: dcel.c gcc -Wall -Wextra -Werror -pedantic -g -o dcel.o dcel.c -c -common: - gcc -Wall -Wextra -Werror -pedantic -g -o common.o common.c -c +voronoi.o: voronoi.c + gcc -Wall -Wextra -Werror -pedantic -g -o voronoi.o voronoi.c -c + +main.o: main.c + gcc -Wall -Wextra -Werror -pedantic -g -o main.o main.c -c diff --git a/common.c b/common.c old mode 100644 new mode 100755 diff --git a/common.h b/common.h old mode 100644 new mode 100755 diff --git a/common.o b/common.o new file mode 100755 index 0000000..61ebccf Binary files /dev/null and b/common.o differ diff --git a/dcel.c b/dcel.c old mode 100644 new mode 100755 diff --git a/dcel.h b/dcel.h old mode 100644 new mode 100755 diff --git a/dcel.o b/dcel.o new file mode 100755 index 0000000..7ec8b6c Binary files /dev/null and b/dcel.o differ diff --git a/ed.supp b/ed.supp new file mode 100755 index 0000000..f2e335d --- /dev/null +++ b/ed.supp @@ -0,0 +1,156 @@ +{ + + Memcheck:Cond + fun:runtime.adjustframe + fun:runtime.gentraceback + fun:runtime.copystack + fun:runtime.newstack + fun:runtime.morestack + fun:runtime.rt0_go +} +{ + + Memcheck:Cond + fun:runtime.adjustframe + fun:runtime.gentraceback + fun:runtime.copystack + fun:runtime.newstack + fun:runtime.morestack + fun:runtime.rt0_go +} +{ + + Memcheck:Cond + fun:runtime.adjustpointer + fun:runtime.adjustframe + fun:runtime.gentraceback + fun:runtime.copystack + fun:runtime.newstack + fun:runtime.morestack + fun:runtime.rt0_go +} +{ + + Memcheck:Cond + fun:runtime.adjustpointer + fun:runtime.adjustframe + fun:runtime.gentraceback + fun:runtime.copystack + fun:runtime.newstack + fun:runtime.morestack + fun:runtime.rt0_go +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:x_cgo_sys_thread_create + fun:_rt0_amd64_lib + fun:call_init + fun:_dl_init + obj:/usr/lib/ld-2.33.so + obj:* + obj:* + obj:* +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:_cgo_sys_thread_start + fun:runtime.asmcgocall + obj:* + fun:runtime.newm + fun:runtime.main.func1 + fun:runtime.systemstack + obj:/mnt/share/ed/libX11.so +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:_cgo_sys_thread_start + fun:runtime.asmcgocall + obj:* + fun:runtime.newm + fun:runtime.startm + fun:runtime.newproc1 + fun:runtime.newproc.func1 + fun:runtime.systemstack +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:_cgo_sys_thread_start + fun:runtime.asmcgocall + obj:* + fun:runtime.newm + fun:runtime.startm + fun:runtime.handoffp + fun:runtime.stoplockedm + fun:runtime.schedule +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:_cgo_sys_thread_start + fun:runtime.asmcgocall + obj:* + fun:runtime.malg.func1 + fun:runtime.systemstack + obj:/mnt/share/ed/libX11.so + fun:runtime.rt0_go +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:x_cgo_sys_thread_create + fun:_rt0_amd64_lib + fun:call_init + fun:_dl_init + obj:/usr/lib/ld-2.33.so +} +{ + + Memcheck:Leak + match-leak-kinds: possible + fun:calloc + fun:_dl_allocate_tls + fun:pthread_create@@GLIBC_2.2.5 + fun:_cgo_try_pthread_create + fun:_cgo_sys_thread_start + fun:runtime.asmcgocall + obj:* + obj:* + obj:* + obj:* + obj:* + obj:* +} diff --git a/main.c b/main.c old mode 100644 new mode 100755 index 79de3ab..aa78b11 --- a/main.c +++ b/main.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) { /* Check for splits, split the polygon if needed */ /* Counts towers in each polygon, outputs to outputFile */ - + // changing something here /* Cleaning up data */ freeTowers(towers, numTowers); freeVertices(vertices, numVertices); diff --git a/main.o b/main.o new file mode 100755 index 0000000..55a1208 Binary files /dev/null and b/main.o differ diff --git a/voronoi.o b/voronoi.o new file mode 100755 index 0000000..9f7d1c6 Binary files /dev/null and b/voronoi.o differ diff --git a/voronoi1 b/voronoi1 index 0c4f7ae..8e01ceb 100755 Binary files a/voronoi1 and b/voronoi1 differ