diff options
| -rw-r--r-- | docker/serverlist.txt | 40 | ||||
| -rwxr-xr-x | profiling/profile_benchmarks.sh | 8 | ||||
| -rwxr-xr-x | profiling/profile_quick.sh | 21 |
3 files changed, 18 insertions, 51 deletions
diff --git a/docker/serverlist.txt b/docker/serverlist.txt index 8a5d389..62a6ea6 100644 --- a/docker/serverlist.txt +++ b/docker/serverlist.txt @@ -8,43 +8,3 @@ localhost:2229 localhost:2230 localhost:2231 localhost:2232 -localhost:2233 -localhost:2234 -localhost:2235 -localhost:2236 -localhost:2237 -localhost:2238 -localhost:2239 -localhost:2240 -localhost:2241 -localhost:2242 -localhost:2243 -localhost:2244 -localhost:2245 -localhost:2246 -localhost:2247 -localhost:2248 -localhost:2249 -localhost:2250 -localhost:2251 -localhost:2252 -localhost:2253 -localhost:2254 -localhost:2255 -localhost:2256 -localhost:2257 -localhost:2258 -localhost:2259 -localhost:2260 -localhost:2261 -localhost:2262 -localhost:2263 -localhost:2264 -localhost:2265 -localhost:2266 -localhost:2267 -localhost:2268 -localhost:2269 -localhost:2270 -localhost:2271 -localhost:2272 diff --git a/profiling/profile_benchmarks.sh b/profiling/profile_benchmarks.sh index 6be86cd..4716192 100755 --- a/profiling/profile_benchmarks.sh +++ b/profiling/profile_benchmarks.sh @@ -35,8 +35,8 @@ generate_test_data() { if [ ! -f "$filename" ]; then echo -e "${YELLOW}Generating test data: $filename (${size})${NC}" # Use the standalone generator - echo " Command: go run cmd/generate_profile_data.go -size \"${size}\" -output \"$filename\" -format log" - go run cmd/generate_profile_data.go -size "${size}" -output "$filename" -format log + echo " Command: go run ../benchmarks/cmd/generate_profile_data.go -size \"${size}\" -output \"$filename\" -format log" + go run ../benchmarks/cmd/generate_profile_data.go -size "${size}" -output "$filename" -format log fi } @@ -112,8 +112,8 @@ generate_test_data "10MB" "$TEST_DATA_DIR/medium.log" # Generate CSV data for dmap (smaller size for faster processing) if [ ! -f "$TEST_DATA_DIR/test.csv" ]; then echo -e "${YELLOW}Generating CSV test data${NC}" - echo " Command: go run cmd/generate_profile_data.go -size \"10MB\" -output \"$TEST_DATA_DIR/test.csv\" -format csv" - go run cmd/generate_profile_data.go -size "10MB" -output "$TEST_DATA_DIR/test.csv" -format csv + echo " Command: go run ../benchmarks/cmd/generate_profile_data.go -size \"10MB\" -output \"$TEST_DATA_DIR/test.csv\" -format csv" + go run ../benchmarks/cmd/generate_profile_data.go -size "10MB" -output "$TEST_DATA_DIR/test.csv" -format csv fi echo diff --git a/profiling/profile_quick.sh b/profiling/profile_quick.sh index 1aa9425..db63c73 100755 --- a/profiling/profile_quick.sh +++ b/profiling/profile_quick.sh @@ -28,10 +28,10 @@ echo # Generate test data if needed if [ ! -f "$TEST_DATA_DIR/quick_test.log" ]; then echo -e "${YELLOW}Generating test data...${NC}" - echo " Command: go run generate_profile_data.go -size \"10MB\" -output \"$TEST_DATA_DIR/quick_test.log\" -format log" - go run generate_profile_data.go -size "10MB" -output "$TEST_DATA_DIR/quick_test.log" -format log - echo " Command: go run generate_profile_data.go -size \"10MB\" -output \"$TEST_DATA_DIR/quick_test.csv\" -format csv" - go run generate_profile_data.go -size "10MB" -output "$TEST_DATA_DIR/quick_test.csv" -format csv + echo " Command: go run ../benchmarks/cmd/generate_profile_data.go -size \"10MB\" -output \"$TEST_DATA_DIR/quick_test.log\" -format log" + go run ../benchmarks/cmd/generate_profile_data.go -size "10MB" -output "$TEST_DATA_DIR/quick_test.log" -format log + echo " Command: go run ../benchmarks/cmd/generate_profile_data.go -size \"10MB\" -output \"$TEST_DATA_DIR/quick_test.csv\" -format csv" + go run ../benchmarks/cmd/generate_profile_data.go -size "10MB" -output "$TEST_DATA_DIR/quick_test.csv" -format csv fi # Build commands @@ -66,10 +66,17 @@ if [ -n "$DGREP_CPU" ]; then ../profiling/profile.sh -top 3 "$DGREP_CPU" | grep -A 5 "Top 3 functions" fi -# Profile dmap +# Profile dmap (use proper MapReduce query on CSV file) echo -e "\n${YELLOW}Profiling dmap...${NC}" -echo "Command: ../dmap -profile -profiledir $PROFILE_DIR -plain -cfg none -query \"select count(*) from $TEST_DATA_DIR/quick_test.csv\"" -../dmap -profile -profiledir "$PROFILE_DIR" -plain -cfg none -query "select count(*) from $TEST_DATA_DIR/quick_test.csv" > /dev/null 2>&1 +QUERY="select count($line),avg($duration) group by $user logformat csv" +echo "Command: ../dmap -profile -profiledir $PROFILE_DIR -plain -cfg none -query \"$QUERY\" -files $TEST_DATA_DIR/quick_test.csv (will interrupt after 3s)" +# Run dmap in background and interrupt after 3 seconds +../dmap -profile -profiledir "$PROFILE_DIR" -plain -cfg none -query "$QUERY" -files "$TEST_DATA_DIR/quick_test.csv" > /dev/null 2>&1 & +DMAP_PID=$! +sleep 3 +kill -INT $DMAP_PID 2>/dev/null || true +wait $DMAP_PID 2>/dev/null || true + DMAP_CPU=$(ls -t "$PROFILE_DIR"/dmap_cpu_*.prof 2>/dev/null | head -1) if [ -n "$DMAP_CPU" ]; then echo " Generated: $(basename "$DMAP_CPU")" |