Update 369-a3 functions

fish/.config/fish/config.fish

@@ -48,6 +48,7 @@ abbr ag "grep-aliases"
 abbr bq "benq-brightness"
 abbr cpc "copy cat"
 abbr cpe "copy echo"
+abbr cpp "copy echo (pwd)"
 abbr cff "create-fish-function"
 abbr ev "evince-silent"
 # git {{{ #
@@ -62,19 +63,21 @@ abbr grmb "git-delete-branch"
 abbr hs "scan-history"
 abbr hst "$EDITOR ~/.local/share/fish/fish_history"
 abbr ut "unix-timestamp"
-abbr z "zathura-silent"
+abbr uzr "unzip-rm"
 
 set -U BROWSER "chromium"
 abbr hm "cd $mfs_dir && hugo serve -D --disableFastRender"
 
+# 309
+abbr r0t "revert-e3-json restaurants"
+abbr r0s "revert-e3-json reservations"
+
 # 369
 abbr grc "grep-c"
 abbr grh "grep-headers"
 abbr rgh "rg-headers"
 
-abbr r6 "run-a3 c lru"
-abbr r6o "run-a3 c lru o"
-abbr g6b "gdb-a3-break c lru"
-
-# abbr cs "carsim"
-# abbr ga2 "gdb-a2"
+abbr r6 "run-a3 f d o"
+abbr r6g "run-a3 f d g"
+abbr r6s "run-a3 s c o"
+abbr g6 "source $fish_fxn_dir/369/a3/gdb-a3-break.fish && gdb-a3-break c c"

fish/.config/fish/functions/369/a3/gdb-a3-break.fish

@@ -1,7 +1,7 @@
 function gdb-a3-break
 	# 1 = trace file, 2 = alg
 	set trace_file 'traceprogs/tr-custom.ref'
-	set memsize 1
+	set memsize 3
 	set swapsize 10
 	if test $argv[1] = 's'
 		set trace_file 'traceprogs/tr-simpleloop.ref'
@@ -9,10 +9,22 @@ function gdb-a3-break
 		set swapsize 3000
 	end
 
+	set alg 'rand'
+	switch $argv[2]
+		case f
+			set alg 'fifo'
+		case l
+			set alg 'lru'
+		case c
+			set alg 'clock'
+	end
+
 	printf '\033c' 
 	and bear make 
-	and gdb -ex "b pagetable.c:69" \
-	# -ex "b lru.c:65" \
+	and gdb \
+	# -ex "b pagetable.c:69" \
+	# -ex "b sim.c:158" \
+	-ex "b clock.c:29" \
 	-ex "run" \
-	--args ./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2]
+	--args ./sim -f $trace_file -m $memsize -s $swapsize -a $alg
 end

fish/.config/fish/functions/369/a3/run-a3.fish

@@ -1,13 +1,32 @@
 function run-a3
-	# 1 = trace file, 2 = alg, 3 = output
+	# 1 = alg, 2 = trace file, 3 = output
 	
-	set trace_file 'traceprogs/tr-custom.ref'
 	set memsize 3
 	set swapsize 10
-	if test $argv[1] = 's'
-		set trace_file 'traceprogs/tr-simpleloop.ref'
-		set memsize 50
-		set swapsize 3000
+	set alg 'rand'
+	switch $argv[1]
+		case f
+			set alg 'fifo'
+			set trace_file 'traceprogs/tr-fifo.ref'
+		case l
+			set alg 'lru'
+			set trace_file 'traceprogs/tr-lru.ref'
+		case c
+			set alg 'clock'
+			set trace_file 'traceprogs/tr-clock.ref'
+	end
+
+	switch $argv[2]
+		case c
+			set trace_file 'traceprogs/tr-custom.ref'
+		case s
+			set trace_file 'traceprogs/tr-simpleloop.ref'
+			set memsize 50
+			set swapsize 3000
+		case m
+			set trace_file 'traceprogs/tr-matmul.ref'
+			set memsize 100
+			set swapsize 3000
 	end
 
 	printf '\033c' 
@@ -16,13 +35,15 @@ function run-a3
 
 	switch $argv[3]
 		case f
-			./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2] > a3.out 2>&1
+			./sim -f $trace_file -m $memsize -s $swapsize -a $alg > a3.out 2>&1
 		case g
 			gdb -ex "run" -ex "bt" -ex "q" \
-			--args ./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2]
+			--args ./sim -f $trace_file -m $memsize -s $swapsize -a $alg
 		case o
-			./sim -f $trace_file -m $memsize -s $swapsize -a $argv[2]
+			./sim -f $trace_file -m $memsize -s $swapsize -a $alg
 	end
 
-	# rm swapfile.*
+	if test (count swapfile.*) -gt 0
+		rm swapfile.*
+	end
 end

fish/.config/fish/functions/revert-e3-json.fish

@@ -0,0 +1,3 @@
+function revert-e3-json
+	cp $argv[1]_example.json $argv[1].json
+end

fish/.config/fish/functions/unzip-rm.fish

@@ -0,0 +1,4 @@
+function unzip-rm
+	unzip $argv[1]
+	and rm $argv[1]
+end

fish/.config/fish/functions/zathura-silent.fish

@@ -1,3 +0,0 @@
-function zathura-silent
-	zathura $argv[1] > /dev/null 2>&1&
-end