Final submission
This commit is contained in:
parent
b5f2cfa2f4
commit
5e480bf4aa
15 changed files with 168 additions and 11 deletions
0
.vscode/launch.json
vendored
Normal file → Executable file
0
.vscode/launch.json
vendored
Normal file → Executable file
0
.vscode/settings.json
vendored
Normal file → Executable file
0
.vscode/settings.json
vendored
Normal file → Executable file
0
.vscode/tasks.json
vendored
Normal file → Executable file
0
.vscode/tasks.json
vendored
Normal file → Executable file
21
Makefile
21
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
|
gcc -Wall -Wextra -Werror -pedantic -g -o voronoi1 main.o voronoi.o dcel.o common.o
|
||||||
rm *.o
|
|
||||||
|
|
||||||
main: voronoi
|
# Compilation commands:
|
||||||
gcc -Wall -Wextra -Werror -pedantic -g -o main.o main.c -c
|
common.o: common.c
|
||||||
|
gcc -Wall -Wextra -Werror -pedantic -g -o common.o common.c -c
|
||||||
|
|
||||||
voronoi: dcel
|
dcel.o: dcel.c
|
||||||
gcc -Wall -Wextra -Werror -pedantic -g -o voronoi.o voronoi.c -c
|
|
||||||
|
|
||||||
dcel: common
|
|
||||||
gcc -Wall -Wextra -Werror -pedantic -g -o dcel.o dcel.c -c
|
gcc -Wall -Wextra -Werror -pedantic -g -o dcel.o dcel.c -c
|
||||||
|
|
||||||
common:
|
voronoi.o: voronoi.c
|
||||||
gcc -Wall -Wextra -Werror -pedantic -g -o common.o common.c -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
|
||||||
|
|
0
common.c
Normal file → Executable file
0
common.c
Normal file → Executable file
0
common.h
Normal file → Executable file
0
common.h
Normal file → Executable file
BIN
common.o
Executable file
BIN
common.o
Executable file
Binary file not shown.
0
dcel.c
Normal file → Executable file
0
dcel.c
Normal file → Executable file
0
dcel.h
Normal file → Executable file
0
dcel.h
Normal file → Executable file
BIN
dcel.o
Executable file
BIN
dcel.o
Executable file
Binary file not shown.
156
ed.supp
Executable file
156
ed.supp
Executable file
|
@ -0,0 +1,156 @@
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
Memcheck:Cond
|
||||||
|
fun:runtime.adjustframe
|
||||||
|
fun:runtime.gentraceback
|
||||||
|
fun:runtime.copystack
|
||||||
|
fun:runtime.newstack
|
||||||
|
fun:runtime.morestack
|
||||||
|
fun:runtime.rt0_go
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
Memcheck:Cond
|
||||||
|
fun:runtime.adjustframe
|
||||||
|
fun:runtime.gentraceback
|
||||||
|
fun:runtime.copystack
|
||||||
|
fun:runtime.newstack
|
||||||
|
fun:runtime.morestack
|
||||||
|
fun:runtime.rt0_go
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
Memcheck:Cond
|
||||||
|
fun:runtime.adjustpointer
|
||||||
|
fun:runtime.adjustframe
|
||||||
|
fun:runtime.gentraceback
|
||||||
|
fun:runtime.copystack
|
||||||
|
fun:runtime.newstack
|
||||||
|
fun:runtime.morestack
|
||||||
|
fun:runtime.rt0_go
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
Memcheck:Cond
|
||||||
|
fun:runtime.adjustpointer
|
||||||
|
fun:runtime.adjustframe
|
||||||
|
fun:runtime.gentraceback
|
||||||
|
fun:runtime.copystack
|
||||||
|
fun:runtime.newstack
|
||||||
|
fun:runtime.morestack
|
||||||
|
fun:runtime.rt0_go
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
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:*
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
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
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
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
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
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
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
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
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<edstem-suppression>
|
||||||
|
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
|
||||||
|
}
|
||||||
|
{
|
||||||
|
<insert_a_suppression_name_here>
|
||||||
|
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:*
|
||||||
|
}
|
2
main.c
Normal file → Executable file
2
main.c
Normal file → Executable file
|
@ -53,7 +53,7 @@ int main(int argc, char **argv) {
|
||||||
/* Check for splits, split the polygon if needed */
|
/* Check for splits, split the polygon if needed */
|
||||||
|
|
||||||
/* Counts towers in each polygon, outputs to outputFile */
|
/* Counts towers in each polygon, outputs to outputFile */
|
||||||
|
// changing something here
|
||||||
/* Cleaning up data */
|
/* Cleaning up data */
|
||||||
freeTowers(towers, numTowers);
|
freeTowers(towers, numTowers);
|
||||||
freeVertices(vertices, numVertices);
|
freeVertices(vertices, numVertices);
|
||||||
|
|
BIN
main.o
Executable file
BIN
main.o
Executable file
Binary file not shown.
BIN
voronoi.o
Executable file
BIN
voronoi.o
Executable file
Binary file not shown.
BIN
voronoi1
BIN
voronoi1
Binary file not shown.
Loading…
Reference in a new issue