diff --git a/waffleClient/.DS_Store b/waffleClient/.DS_Store new file mode 100644 index 000000000..754f514ec Binary files /dev/null and b/waffleClient/.DS_Store differ diff --git a/waffleClient/._.DS_Store b/waffleClient/._.DS_Store new file mode 100644 index 000000000..b15999675 Binary files /dev/null and b/waffleClient/._.DS_Store differ diff --git a/waffleClient/benchmark/src/proxy_benchmark.cpp b/waffleClient/benchmark/src/proxy_benchmark.cpp index eab1242bd..7c0c239b5 100644 --- a/waffleClient/benchmark/src/proxy_benchmark.cpp +++ b/waffleClient/benchmark/src/proxy_benchmark.cpp @@ -1,8 +1,3 @@ -// -// Created by Lloyd Brown on 10/24/19. -// - -// for windows mkdir #ifdef _WIN32 #include #endif @@ -91,6 +86,7 @@ void run_benchmark(int run_time, bool stats, std::vector &latencies, int cl std::vector results; int i = 0; while (elapsed < run_time*1000000) { + if(i == trace.size()) break; //std::cout << "Entering proxy_benchmark.cpp line " << __LINE__ << "i = " << i << std::endl; if (stats) { rdtscll(start); @@ -113,7 +109,7 @@ void run_benchmark(int run_time, bool stats, std::vector &latencies, int cl } e = std::chrono::high_resolution_clock::now(); elapsed = static_cast(std::chrono::duration_cast(e - s).count()); - i = (i+1)%keys_values_pair.first.size(); + ++i; } if (stats) ops = client.num_requests_satisfied() - ops; @@ -138,14 +134,14 @@ void client(int idx, int client_batch_size, int object_size, trace_vector &trace async_proxy_client client; client.init(host, proxy_port); - // std::cout << "Client initialized" << std::endl; + // std::cout << "Client initialized with batch size " << client_batch_size << std::endl; std::atomic indiv_xput; std::atomic_init(&indiv_xput, 0); std::vector latencies; // std::cout << "Beginning warmup" << std::endl; warmup(latencies, client_batch_size, object_size, trace, indiv_xput, client); // std::cout << "Beginning benchmark" << std::endl; - run_benchmark(20, true, latencies, client_batch_size, object_size, trace, indiv_xput, client); + run_benchmark(30, true, latencies, client_batch_size, object_size, trace, indiv_xput, client); std::string location = output_directory + "/" + std::to_string(idx); std::ofstream out(location); std::string line(""); @@ -188,7 +184,7 @@ int _mkdir(const char *path) { } int main(int argc, char *argv[]) { - std::string proxy_host = "192.168.152.109"; + std::string proxy_host = "192.168.252.109"; int proxy_port = 9090; std::string trace_location = ""; int client_batch_size = 50; diff --git a/waffleClient/bin/proxy_benchmark b/waffleClient/bin/proxy_benchmark index 9063f29bc..8bcb565cd 100755 Binary files a/waffleClient/bin/proxy_benchmark and b/waffleClient/bin/proxy_benchmark differ diff --git a/waffleClient/bin/proxy_server b/waffleClient/bin/proxy_server index 22ed6647f..507e5609e 100755 Binary files a/waffleClient/bin/proxy_server and b/waffleClient/bin/proxy_server differ diff --git a/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/encryption_engine.cpp.o b/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/encryption_engine.cpp.o index 2d8ac6f3e..bc50b31f7 100644 Binary files a/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/encryption_engine.cpp.o and b/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/encryption_engine.cpp.o differ diff --git a/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/waffle_proxy.cpp.o b/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/waffle_proxy.cpp.o index 7b286644c..25b1a2acf 100644 Binary files a/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/waffle_proxy.cpp.o and b/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/__/proxy/src/waffle_proxy.cpp.o differ diff --git a/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/src/proxy_benchmark.cpp.o b/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/src/proxy_benchmark.cpp.o index fb054f612..c4eca50b1 100644 Binary files a/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/src/proxy_benchmark.cpp.o and b/waffleClient/cmakebuild/benchmark/CMakeFiles/proxy_benchmark.dir/src/proxy_benchmark.cpp.o differ diff --git a/waffleClient/cmakebuild/cpp_redis-prefix/src/cpp_redis-stamp/cpp_redis-configure-out.log b/waffleClient/cmakebuild/cpp_redis-prefix/src/cpp_redis-stamp/cpp_redis-configure-out.log index df09b4cdf..2b7d9180e 100644 --- a/waffleClient/cmakebuild/cpp_redis-prefix/src/cpp_redis-stamp/cpp_redis-configure-out.log +++ b/waffleClient/cmakebuild/cpp_redis-prefix/src/cpp_redis-stamp/cpp_redis-configure-out.log @@ -1,3 +1,3 @@ --- Configuring done (0.0s) --- Generating done (0.0s) +-- Configuring done (0.3s) +-- Generating done (0.3s) -- Build files have been written to: /home/svemula/Waffle/waffle_test/waffleClient/cmakebuild/cpp_redis-prefix/src/cpp_redis-build diff --git a/waffleClient/cmakebuild/libcuckoo-prefix/src/libcuckoo-stamp/libcuckoo-configure-out.log b/waffleClient/cmakebuild/libcuckoo-prefix/src/libcuckoo-stamp/libcuckoo-configure-out.log index 8017184f6..26e5d98a5 100644 --- a/waffleClient/cmakebuild/libcuckoo-prefix/src/libcuckoo-stamp/libcuckoo-configure-out.log +++ b/waffleClient/cmakebuild/libcuckoo-prefix/src/libcuckoo-stamp/libcuckoo-configure-out.log @@ -1,3 +1,3 @@ --- Configuring done (0.0s) --- Generating done (0.0s) +-- Configuring done (0.1s) +-- Generating done (0.2s) -- Build files have been written to: /home/svemula/Waffle/waffle_test/waffleClient/cmakebuild/libcuckoo-prefix/src/libcuckoo-build diff --git a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/encryption_engine.cpp.o b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/encryption_engine.cpp.o index 2d8ac6f3e..bc50b31f7 100644 Binary files a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/encryption_engine.cpp.o and b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/encryption_engine.cpp.o differ diff --git a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/waffle_proxy.cpp.o b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/waffle_proxy.cpp.o index 7b286644c..25b1a2acf 100644 Binary files a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/waffle_proxy.cpp.o and b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/__/proxy/src/waffle_proxy.cpp.o differ diff --git a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/src/proxy_server.cpp.o b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/src/proxy_server.cpp.o index ac9e0bc39..484e7b388 100644 Binary files a/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/src/proxy_server.cpp.o and b/waffleClient/cmakebuild/server/CMakeFiles/proxy_server.dir/src/proxy_server.cpp.o differ diff --git a/waffleClient/data/MonMar2019:32/1 b/waffleClient/data/MonMar2019:32/1 deleted file mode 100644 index 9d57180d9..000000000 --- a/waffleClient/data/MonMar2019:32/1 +++ /dev/null @@ -1,2665 +0,0 @@ -1735 -689 -1065 -617 -1624 -1034 -901 -694 -597 -1077 -624 -933 -567 -861 -558 -955 -609 -1052 -748 -875 -876 -599 -854 -565 -861 -560 -975 -619 -994 -874 -562 -673 -931 -1099 -999 -635 -1084 -622 -851 -585 -821 -846 -561 -593 -833 -1044 -559 -559 -821 -554 -863 -556 -828 -555 -555 -938 -841 -559 -565 -856 -568 -895 -678 -855 -549 -863 -559 -828 -555 -835 -835 -562 -823 -653 -858 -565 -829 -557 -874 -1351 -586 -560 -830 -563 -857 -555 -832 -556 -826 -561 -828 -923 -571 -563 -833 -830 -593 -570 -830 -561 -837 -561 -834 -564 -567 -819 -836 -556 -563 -826 -700 -837 -568 -829 -606 -831 -559 -825 -551 -828 -815 -549 -823 -554 -819 -557 -853 -561 -826 -954 -573 -558 -873 -555 -827 -551 -820 -566 -826 -546 -824 -818 -550 -547 -849 -818 -549 -658 -831 -555 -270787 -673 -682 -432 -422 -641 -621 -417 -416 -643 -412 -620 -420 -633 -421 -619 -532 -647 -451 -641 -613 -421 -615 -425 -636 -414 -620 -413 -632 -609 -412 -418 -613 -416 -693 -416 -649 -417 -614 -414 -632 -612 -410 -411 -613 -619 -422 -411 -635 -409 -624 -412 -687 -428 -250321 -1237 -769 -510 -490 -712 -483 -719 -480 -719 -474 -705 -480 -706 -482 -718 -703 -588 -758 -487 -717 -486 -715 -483 -711 -707 -487 -473 -703 -6196596 -1360 -712 -903 -528 -1818 -723 -1602 -1756 -1187 -2420 -1460 -1394 -1370 -1505 -2103 -1236 -1633 -1501 -1599 -1299 -1851 -1530 -1625 -1229 -1416 -1881 -1379 -1814 -1277 -2221 -2087 -1572 -1796 -1132 -1566 -1933 -3192 -1403 -1494 -1644 -878 -472 -2323 -2211 -1958 -1371 -1296 -1255 -1390 -1240 -1400 -1251 -1545 -1244 -1488 -1108 -1591 -1398 -2158 -970 -1066 -1507 -914 -1397 -1535 -1217 -1270 -1336 -1310 -1242 -1254 -1598 -1320 -1005 -1263 -1459 -897 -1562 -932 -1381 -1235 -1442 -1054 -1535 -1221 -1386 -1328 -992 -1407 -963 -1708 -947 -1450 -1060 -1586 -1064 -1150 -2460 -1343 -1250 -1024 -1292 -1180 -1328 -1071 -1563 -720 -1388 -1143 -1112 -1070 -1896 -484 -9499809 -1252 -879 -976 -763 -1026 -5646469 -1268 -1146 -1024 -813 -616 -988 -1925 -2875 -1377 -1892 -1366 -3163 -2570 -2888 -3103 -3114 -2782 -2935 -2707 -2792 -2303 -1676 -1750 -1663 -2350 -1639 -2681 -6011 -2279 -1940900 -1119 -1068 -960 -952 -959 -530 -1071 -933 -521 -608 -1062 -1081 -626 -586 -3021 -1475 -3035 -1823 -1829 -1342 -1431 -1192 -1363 -1976 -2006 -2189 -1696 -2167 -1621 -1863 -1003 -1763 -990 -1434 -1856 -2362 -2845 -2625 -1536 -1233 -1413 -1147 -2002 -2197 -1727 -1563 -2101 -975 -1425 -1781 -878 -1230 -3392 -1008 -2435 -2052 -1751 -2026 -2338 -1661 -2536 -1630 -1606 -1510 -1441 -1209 -1191 -1012 -1150 -1169 -1815 -1938 -1941 -1765 -1802 -1756 -988 -1447 -855 -1576 -516 -1993 -1568 -8412420 -829 -1288 -1203 -1423 -1125 -777 -1492 -1035 -1106 -601 -1106 -850 -607 -1147 -948 -664 -871 -2599226 -1670 -991 -1290 -984 -1095 -1175 -644 -976 -1684 -2399 -1794 -1664 -2346 -1328 -1882 -2557 -3012 -2927469 -1352 -1210 -966 -941 -794 -865 -1084 -1432 -837 -1299 -865 -1328 -1262 -2229 -1831 -2195 -2048 -1686 -2081 -1846 -2304 -1798 -2110 -1760 -2334 -2020 -1634 -1802 -2401 -654 -3264 -1246 -1520 -1439 -1126 -1234 -3461 -1997 -699 -679 -982 -892 -2377 -1758 -1938 -1096 -2638 -1352 -881 -1153 -1389 -1998 -1624 -1663 -2497 -1832 -1612 -1968 -1348 -878 -952 -1518 -617 -1273 -1389 -1967 -2287 -1331 -1627 -1069 -1686 -1141 -2010 -1801 -1761 -2286 -2046 -13871485 -933 -615 -693 -444 -611 -228372 -1380 -1254 -1095 -1014 -627 -122916 -1689 -941 -1085 -752 -984 -107117 -1364 -944 -1339 -1016 -833 -1186 -1135 -665 -652 -935 -763 -752941 -754 -1869 -868 -1463 -816 -918 -630 -1933 -910 -581 -976 -709 -828 -683 -1062 -875 -994 -1053 -993 -1453 -1397 -1214 -1237 -1332 -1073 -1402 -1450 -1757 -1529 -1033 -1377 -760 -1419 -1561 -963 -867 -1127 -1328 -1373 -581 -4475 -1245 -1198 -1583 -1128 -730 -552 -1063 -591 -809 -1097 -1575 -1007 -1593 -1276 -1342 -1015 -1584 -881 -1307 -1455 -1927 -1474 -1036 -1471 -1195 -1258 -1162 -2082 -566 -1195 -1052 -999 -1029 -1374 -1162 -3153 -1127 -741 -1400 -1126 -1378 -1770 -22270721 -832 -1119 -1663 -773 -1342 -852 -1149 -647 -923 -930 -1532 -829 -846 -1085 -603 -2364 -927 -1151 -824 -1478 -789 -1790 -686 -2027 -2335 -771 -1301 -635 -820164 -676 -997 -753 -1141 -1561 -2039 -1450 -1105 -705 -1113 -1212 -1038 -1356 -1279 -1480 -1570 -1176 -1618 -1409 -1769 -1196 -1004 -1846 -2103 -1398 -2111 -1537 -1885 -1671 -1771 -2111 -1610 -1457 -2015 -1768 -2092 -1677 -1691 -1761 -3238 -2438 -1514 -1119 -1176 -1789 -838 -500 -1756 -1310 -1610 -1374 -1495 -1134 -1850 -1195 -1280 -2201 -2216 -638 -903 -483 -1558 -1147 -1576 -1321 -1584 -1270 -1375 -1273 -1588 -1341 -1258 -1444 -1562 -1128 -1619 -1116 -1437 -9961774 -771 -1622 -1041 -619 -603 -4145828 -848 -1294 -1055 -1703 -770 -1180 -1827 -1252 -1586 -1708 -555158 -1225 -1102 -602 -919 -1067 -1418 -793 -983 -1034 -1224 -1096 -971 -893 -887 -534 -2049 -891 -1747 -1406 -1242 -838 -1398 -1054 -2074 -1104 -1234 -1204 -2145 -1803 -2419 -1274 -1566 -590 -1457 -1807 -932 -867592 -869 -1004 -670 -871 -536 -80064 -993 -1142 -963 -908 -638 -845 -911 -809 -1324 -945 -2061 -1556 -1583 -1146 -1686 -1475 -1110 -2122 -1836 -1298 -3337 -588 -1464 -1018 -2341 -1169 -2369 -2087 -1463 -1145 -1522 -3812 -1194 -1958 -1899 -1032 -944 -631 -987 -877679 -766 -1181 -880 -968 -555 -1062 -1151 -855 -1872 -1438 -2138 -1764 -1015 -2051 -1424 -1224 -904 -2352 -1309 -541 -1649 -1588 -1642 -46696 -14312528 -1075 -933 -621 -1627 -939 -1976 -8141599 -1322 -1082 -1978 -1127 -1112 -980 -752 -865 -1439 -1243 -817 -944 -878 -743 -1032 -732 -1000 -740 -1514 -2614 -914 -2703 -1012 -1049 -619 -2194 -1161 -500853 -752 -1316 -931 -1045 -582 -893 -2083 -2403 -1887 -1508 -2302 -1421 -2434 -1210 -2040 -1533 -1218 -2657 -1861 -1439 -1354 -1888 -2093 -1428 -1959 -2129 -1740 -1339 -2120 -1701 -1890 -1458 -1072 -2057 -1786 -1562 -1808 -2082 -1820 -1313 -1992 -1880 -1200 -2866 -4170 -1711 -2079 -1640 -1492 -3030 -2024 -1268 -1210 -2923 -1722 -801 -843 -555 -777 -1363 -1792 -1021 -1433 -1264 -1471 -1105 -1678 -1944 -1446 -1822 -1822 -1240 -1871 -1163 -1507 -1297 -1262 -140628 -435 -14958960 -1264 -935 -1116 -849 -833 -578 -819 -835 -1902 -680 -1399 -862 -920 -923 -641 -898 -1049 -1338 -1032 -1248 -1080 -1298 -1228 -1468 -1294 -1326 -894 -978 -1606 -1155 -1210 -508 -1654 -2589 -818 -1141 -533 -1043 -1174 -1128449 -1419 -923 -912 -524 -3194 -569 -5991 -1270 -635 -688 -1220 -1117 -882 -1657 -1363 -1117 -1674 -1245 -996 -1428 -999 -1420 -1355 -1236 -1325 -1373 -1206 -1181 -2013 -1391 -544 -2158 -739 -875 -620 -1790 -948 -542 -3454 -1253 -1268 -537 -1885 -1227 -853 -977 -689 -485 -992 -1598 -738 -1886 -845 -500 -836 -504 -1163 -1486 -982 -1008 -932 -1766 -519 -1386 -1221 -1483 -804 -1172 -743 -1373 -1366 -1109 -18748165 -11848241 -1331 -1131 -860 -1149 -702 -1478 -1767 -1544 -1345 -2687 -1630 -1685 -1660 -2264 -1505 -2128 -1491 -1902 -2026 -1640 -1973 -1799 -2078 -54247 -1026 -1664 -2226 -1787 -1724 -637 -1931 -2000 -1484 -4110 -1815 -1598 -2250 -1913 -1034 -609 -1800 -1906 -2288 -1145 -2126 -2474 -773 -1823 -2532 -1295 -1670 -2107 -2058 -1937 -2038 -2326 -1508 -2227 -1657 -2118 -1874 -3829 -1754 -1994 -2314 -610 -1135 -1963 -2094 -1749 -1869 -2088 -1823 -2184 -1615 -2252 -2108 -1581 -1660 -1565 -1713 -1849 -1685 -1810 -1674 -1675 -1823 -1605 -1695 -3622 -2193 -1669 -1254 -1448 -966 -1184 -1740 -2076 -1557 -1815 -1999 -1869 -1750 -1885 -1881 -1973 -1659 -2467 -1905 -1967 -3567 -900 -1786 -1543 -2367 -1975 -3782 -1692 -5513595 -698 -801 -705 -494 -403 -597 -11857738 -1687 -871 -1159 -615 -859 -948 -3763 -1128 -714 -606 -1086 -904 -1670 -1703 -2387 -1325 -2593 -1406 -1883 -1438 -588 -1989 -2382 -1317 -2030 -1850 -1299 -1907 -1546 -2024 -2480 -1814 -2047 -1542 -704 -2508 -1412 -1874 -1389 -1405 -1690 -1722 -2409 -1994 -1380 -3861 -1318 -1205 -2058 -1439 -1141 -693 -1252 -1731 -1859 -1580 -1477 -1758 -1194 -1398 -1750 -1506 -1686 -1370 -1782 -1235 -2160 -1353 -1401 -1267 -1556 -1845 -1461 -1247 -1623 -1208 -1746 -1504 -2106 -2471 -1982 -2504 -1514 -2486 -1363 -1368 -1348 -1287 -1769 -566 -3294 -1338 -1734 -1581 -1026 -517 -347 -1231 -1358 -1193 -1454 -18358433 -1400 -777 -2328 -1071 -1044 -1036 -700 -862 -1169 -1829 -1237 -8126 -1937 -1575 -2134 -1574 -2225 -1300 -1792 -1627 -2091 -1117 -1902 -1773 -1332 -2479 -1279 -2110 -2308 -1416 -1541 -1045 -2204 -2089 -1454 -1516 -1799 -1548 -1587 -1291 -1538 -1909 -1592 -1834 -1908 -1683 -5566 -779 -2623 -1445 -1169 -617 -1441 -1113 -886 -1144 -681 -558 -1736 -1477 -585 -1446 -1373 -1149 -1288 -2699 -1731 -1153 -1084 -1294 -3133 -1085 -1315 -1126 -985 -1942 -767 -1003 -570 -1246 -758 -914 -563 -2138 -1371 -655 -884 -1228 -1378 -599 -1635 -601 -1772 -916 -1200 -653 -1793 -1550 -2134 -1557 -2503 -877 -528 -963 -1293 -1234 -1375 -832 -2089 -1252 -1085 -1335 -1102 -1198 -1277 -1218 -1153 -1228 -1453 -31476 -1568 -2009 -946 -947 -948 -1509 -800 -1369 -913 -1390 -899 -19389823 -794 -1722 -1412 -768 -1033 -825 -964 -745 -1082 -1550 -1150 -2082 -799 -1504 -1074 -630 -1640 -170004 -1332 -800 -935 -566 -1055 -97433 -795 -1177 -1169 -911 -664 -744 -1247 -1702 -1031 -581 -807 -733 -793 -1380 -2760 -1438 -611 -1484 -1260 -2286 -1260 -1327 -702 -2130 -1745 -1373 -1215 -2059 -2260 -1468 -1378 -1193 -2398 -1289 -1634 -1271 -1374 -1761 -1049 -2698 -1936 -1191 -1215 -1546 -1472 -1296 -2005 -1050 -1386 -3429 -835 -570 -2342 -1010 -569 -628 -753 -949 -2378 -861 -1589 -1616 -863 -1294 -1226 -1548 -1749 -1218 -1518 -1762 -1284 -1546 -1365 -1439 -973 -1693 -1300 -13321 -779 -446 -1649 -1040 -1627 -1352 -1022 -2259 -956 -1283 -1388 -18944840 -981 -479 -678 -932 -1869 -1792 -3175 -1737 -1679 -2984 -1962 -1732 -1751 -1766 -1602 -1432 -1895 -2156 -2434 -722 -1107 -1252 -1127 -1721 -1130 -1501 -1548 -1478 -1452 -2163 -1181 -3358 -1443 -1131 -679 -1397 -1367 -1376 -1893 -876 -1623 -1215 -1291 -1937 -1702 -1254 -1537 -1342 -1158 -1328 -4642 -1196 -1266 -5804321 -1106 -585 -897 -648 -776 -648 -3311 -847 -716 -724 -454 -2600 -1392 -475 -2244 -922 -1172 -1236 -1063 -1781 -960 -1419 -1397 -1646 -994 -1293 -1161 -2062 -892 -1777 -861 -1637 -872 -1667 -3543 -1777 -1800 -1113 -1244 -1083 -958 -655 -647 -1505 -2252 -1372 -1455 -12063465 -1269 -652 -1618 -818 -1664 -2053 -2481 -967 -1951 -575 -525 -1497 -1104 -1259 -2416 -1586 -2094 -1636 -2077 -2314 -2105 -1486 -954 -25500 -359 -1841 -1681 -1346 -2280 -488071 -463 -742 -653 -588 -1115 -1934 -1658 -1105 -1934 -2473 -622 -352 -1953 -1988 -1984 -3521 -641 -1990 -1432 -1711 -2283 -912 -1791 -1839 -2242 -1655 -2590 -2798 -2448 -2246 -1899 -1557 -2374 -3530 -2387 -1159 -1386 -1195 -1295 -2550 -1873 -838 -938 -2420 -2156 -2298 -1814 -1878 -1777 -1915 -1352 -2370 -1547 -1349 -1692 -1809 -1635 -1930 -1446 -1545 -1542 -3153 -615 -1902 -602 -1399 -1261 -1313 -1441 -1765 -1866 -462598 -884 -378 -1001 -1947 -2902 -1646 -1465 -1584 -1673 -1511 -1701 -19766286 -1678 -825 -1656 -675 -1430 -881 -1583 -921 -876 -739 -617 -77819 -797 -1571 -1042 -1427 -1057 -1338 -836 -1477 -788 -872 -995 -622 -999 -1193 -1016 -714 -1080 -873 -1754 -3909 -1636 -675 -1639 -1460 -1139 -1601 -1184 -634 -1342 -1495 -1307 -905 -890 -848 -1882 -1478 -2885 -1451 -1078 -1885 -1855 -980 -929 -567 -561 -1020 -1456 -1308 -1170 -1329 -1158 -1438 -1145 -1488 -1130 -1447 -2117 -1835 -644 -2683 -744 -427 -549 -1109 -1108 -1044 -1437 -1143 -1398 -1383 -1171 -1144 -1545 -1240 -1332 -1196 -1272 -1492 -1736 -2452 -1071 -1433 -1229 -962 -1022 -1493 -723 -1364 -1071 -1261 -1277 -1068 -1145 -1188 -1365 -1236 -809 -2444 -1358 -1354 -711 -23202593 -939 -1519 -639 -2142 -1686 -2408 -3367 -1685 -2199 -2064 -1965 -2297 -2728 -1936 -2521 -1664 -2326 -1822 -1770 -2000 -1958 -1759 -2566 -1177 -2244 -6296 -1584 -3069 -2866 -1292 -1035 -751 -1907 -2277 -3262 -3391 -2780 -1894 -2311 -2017 -3058 -2643 -1561 -2247 -2392 -2098 -3566 -2676 -2418 -2806 -2910 -2375 -2408 -2543 -1695 -2348 -2649 -2536 -2300 -3819 -2356 -1842 -2030 -704 -1095 -615 -1399 -1421 -1319 -1325 -1666 -1371 -1563 -1296 -1457 -1151 -1533 -775 -1409 -1342 -1271 -1464 -1508 -1549 -1292 -1451 -1546 -1233 -1229 -1443 -1669 -1334 -1293 -2660 -917 -785 -2542 -1658 -717 -1128 -1236 -1614 -1352 -1551 -966 -1536 -1221 -1604 -1255 -1231 -1093 -1322 -1459 -1162 -1530 -1394 -1342 -1259 -1240 -16730762 -1551 -978 -1055 -1368 -1089 -616 -1008 -678 -868 -1991 -1673 -819 -1074 -1432 -1439 -1084 -1317 -1033 -1346 -748 -1159 -986 -938 -1126 -1046 -1231 -1199 -1216 -1488 -4601981 -1212 -2035 -906 -1176 -896 -1216 -931 -1222 -1409 -1180 -1547 -1076 -1201 -980 -1224 -958 -1580 -1107 -884 -1013 -1054 -803 -1115 -771 -1232 -827 -1384 -637 -1074 -1064 -718 -1080 -1279 -1046 -888 -908 -1486 -617 -1202 -815 -973 -581 -1891 -1725 -1577 -833 -901 -867 -807 -1036 -597 -1463 -603 -1688 -854 -1431 -1428 -1601 -964 -1276 -1398 -1299 -1416 -593 -1793 -575 -1944 -861 -1356 -2758 -1133 -593 -1120 -684 -1399 -2466 -893 -1440 -1334 -1380 -1229 -587 -1815 -1304 -600 -1319 -1543 -958 -1643 -595 -1147 -596 -1468 -908 -2187 -743 -576 -1320 -1414 -1167 -575 -14642381 -721 -817 -499 -664 -392 -428460 -1944 -1045 -1201 -1133 -1175 -905 -1447 -888 -1185 -1423 -797 -1681 -1795 -742 -1113 -912 -1372 -691 -968 -569 -766 -875 -686 -194859 -1292 -1621 -624 -2511 -2215 -2303 -2225 -2752 -3928 -1634 -2499 -1462 -1323 -1750 -2031 -2826 -1800 -2133 -1921 -2442 -2043 -1862 -2126 -2464 -1670 -2292 -1982 -1776 -2168 -2636 -954 -2183 -2104 -1669 -2481 -1653 -1611 -1717 -2303 -1759 -3041 -896 -2156 -1800 -2359 -2114 -2234 -2062 -1641 -2025 -2636 -1989 -1990 -2239 -1661 -2061 -2053 -2326 -2692 -1958 -1884 -2294 -2226 -1758 -1823 -24502759 -1054 -1198 -1089 -2046 -1146 -1264 -624 -878 -1037 -856 -1158 -678 -1327 -779 -1085 -1209 -1161 -1228 -1196 -913 -824 -815 -1655 -923 -963 -568 -1700 -2192 -1971 -1053 -901 -974 -747 -563 -2318 -1495 -1036 -882 -1037 -843 -908 -578 -3644 -1763 -1978 -2250 -2035 -1639 -1988 -2054 -1860 -1989 -1794 -1745 -1922 -1856 -1808 -2055 -2072 -1810 -2318 -1858 -3663 -2414 -2151 -587 -1658 -1621 -2766 -1525 -1587 -1595 -2275 -1575 -1994 -1800 -1937 -1711 -2100 -1638 -2202 -2042 -1694 -1771 -2042 -1914 -1643 -1868 -1960 -1618 -2289 -1567 -1941 -1748 -1716 -2201 -4193 -870 -1463 -1841 -499 -534 -723 -1283 -837 -1477 -1052 -1276253 -673 -781 -758 -431 -683 -526 -828 -1468 -690 -1287 -1110 -923 -1298 -1201 -1470 -1386 -1585 -1278 -1381 -1343 -1727 -1973 -1470 -1007 -888 -2542 -1584 -2205 -1940 -10938411 -1074 -563 -724 -485 -623 -396 -710 -1312 -1448 -659 -589 -975 -634 -1657 -810 -1686 -1134 -649453 -792 -1145 -788 -1255 -1194 -580 -802 -570 -1478 -946 -1058 -630 -1081 -1255 -611 -641 -1511 -919 -1375 -846 -1195 -591 -1081 -629 -2831 -1281 -904 -1930 -989 -1106 -1347 -1119 -1578 -1419 -1433 -1123 -1957 -624 -742 -1685 -1292 -1095 -1441 -1561 -770 -1390 -1721 -1631 -1086 -1578 -1044 -1581 -1058 -1574 -1199 -1313 -1261 -1597 -1361 -1359 -1458 -1291 -1236 -2237 -897 -17353455 -1739 -1146 -1386 -937 -903 -577 -1246 -783 -1158 -975 -573 -13403 -1704 -1323 -831 -660 -1446 -2611 -1203 -863 -1169 -701 -860 -1220 -1062 -1065 -667 -962 -604 -552952 -740 -1351 -1392 -1266 -908 -984 -746 -1729 -1280 -810 -998 -1267 -1674 -1193 -1502 -1133 -1078 -1503 -988 -588 -1730 -1301 -947 -574 -2143 -584 -1702 -1139 -1667 -963 -3016 -1423 -1418 -855 -1848 -1693 -1134 -768 -1005 -825 -915 -771 -594 -822 -1522 -1816 -1529 -946 -1115 -1262 -1062 -1618 -1072 -1608 -1281 -1704 -1193 -835 -2051 -1132 -822 -3286 -1987 -1010 -1771 -553 -1667 -784 -1248 -1296 -1339 -1215 -900 -1478 -1425 -1240 -1653 -1326 -1299 -1341 -1318 -1211 -1834 -1348 -1010 -1309 -1543 -1343 -1443 -1328 -1703 -1179 -1214 -1658 -1278 -1065 -544 -2030 -1186 -833 -1263 -19755057 -Xput: 6430 diff --git a/waffleClient/libclient/src/async_proxy_client.cpp b/waffleClient/libclient/src/async_proxy_client.cpp index 0e8e13288..d183a9611 100644 --- a/waffleClient/libclient/src/async_proxy_client.cpp +++ b/waffleClient/libclient/src/async_proxy_client.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/1/19. -// - #include "async_proxy_client.h" using namespace ::apache::thrift; diff --git a/waffleClient/libclient/src/async_proxy_client.h b/waffleClient/libclient/src/async_proxy_client.h index cf85a44f5..34d9a9052 100644 --- a/waffleClient/libclient/src/async_proxy_client.h +++ b/waffleClient/libclient/src/async_proxy_client.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/1/19. -// - #ifndef WAFFLE_ASYNC_PROXY_CLIENT_H #define WAFFLE_ASYNC_PROXY_CLIENT_H diff --git a/waffleClient/libclient/src/client.h b/waffleClient/libclient/src/client.h index 59374e02f..7ba322562 100644 --- a/waffleClient/libclient/src/client.h +++ b/waffleClient/libclient/src/client.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/29/19. -// - #ifndef CLIENT_H #define CLIENT_H #include diff --git a/waffleClient/libclient/src/proxy_client.cpp b/waffleClient/libclient/src/proxy_client.cpp index f8d06ee8b..8214dce90 100644 --- a/waffleClient/libclient/src/proxy_client.cpp +++ b/waffleClient/libclient/src/proxy_client.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/1/19. -// - #include "proxy_client.h" using namespace ::apache::thrift; diff --git a/waffleClient/libclient/src/proxy_client.h b/waffleClient/libclient/src/proxy_client.h index fdab4e841..9b3ca627b 100644 --- a/waffleClient/libclient/src/proxy_client.h +++ b/waffleClient/libclient/src/proxy_client.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/1/19. -// - #ifndef WAFFLE_PROXY_CLIENT_H #define WAFFLE_PROXY_CLIENT_H diff --git a/waffleClient/libstorage/src/redis.cpp b/waffleClient/libstorage/src/redis.cpp index bbe61065f..4da3f525d 100644 --- a/waffleClient/libstorage/src/redis.cpp +++ b/waffleClient/libstorage/src/redis.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 9/2/19. -// - #include "redis.h" redis::redis(const std::string &host_name, int port){ diff --git a/waffleClient/libstorage/src/redis.h b/waffleClient/libstorage/src/redis.h index c483a95b4..da18429d9 100644 --- a/waffleClient/libstorage/src/redis.h +++ b/waffleClient/libstorage/src/redis.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/29/19. -// - #ifndef REDIS_H #define REDIS_H diff --git a/waffleClient/libstorage/src/storage_interface.h b/waffleClient/libstorage/src/storage_interface.h index dda309941..595647f78 100644 --- a/waffleClient/libstorage/src/storage_interface.h +++ b/waffleClient/libstorage/src/storage_interface.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/29/19. -// - #ifndef STORAGE_INTERFACE_H #define STORAGE_INTERFACE_H #include diff --git a/waffleClient/proxy/src/encryption_engine.cpp b/waffleClient/proxy/src/encryption_engine.cpp index 19a039c09..c70a8e1bd 100644 --- a/waffleClient/proxy/src/encryption_engine.cpp +++ b/waffleClient/proxy/src/encryption_engine.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/30/19. -// - #include "encryption_engine.h" #include diff --git a/waffleClient/proxy/src/encryption_engine.h b/waffleClient/proxy/src/encryption_engine.h index 4d0b3e063..731b2277a 100644 --- a/waffleClient/proxy/src/encryption_engine.h +++ b/waffleClient/proxy/src/encryption_engine.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/30/19. -// - #ifndef WAFFLE_ENCRYPTION_ENGINE_H #define WAFFLE_ENCRYPTION_ENGINE_H diff --git a/waffleClient/proxy/src/operation.h b/waffleClient/proxy/src/operation.h index fe7193454..32d09099c 100644 --- a/waffleClient/proxy/src/operation.h +++ b/waffleClient/proxy/src/operation.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/29/19. -// - #ifndef WAFFLE_OPERATION_H #define WAFFLE_OPERATION_H diff --git a/waffleClient/proxy/src/proxy.h b/waffleClient/proxy/src/proxy.h index cfac94eb9..d9038b56e 100644 --- a/waffleClient/proxy/src/proxy.h +++ b/waffleClient/proxy/src/proxy.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/29/19. -// - #ifndef PROXY_H #define PROXY_H diff --git a/waffleClient/proxy/src/queue.cpp b/waffleClient/proxy/src/queue.cpp index 892f3f4f4..583167c4d 100644 --- a/waffleClient/proxy/src/queue.cpp +++ b/waffleClient/proxy/src/queue.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 9/28/19. -// - #include "queue.h" template T queue::pop() { diff --git a/waffleClient/proxy/src/queue.h b/waffleClient/proxy/src/queue.h index 840be892b..c01a4b423 100644 --- a/waffleClient/proxy/src/queue.h +++ b/waffleClient/proxy/src/queue.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 9/28/19. -// - #ifndef WAFFLE_QUEUE_H #define WAFFLE_QUEUE_H diff --git a/waffleClient/proxy/src/util.cpp b/waffleClient/proxy/src/util.cpp index 85435152f..add2f3c38 100644 --- a/waffleClient/proxy/src/util.cpp +++ b/waffleClient/proxy/src/util.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 9/20/19. -// - #include "util.h" uint32_t rand_uint32(const uint32_t &min, const uint32_t &max) { diff --git a/waffleClient/proxy/src/util.h b/waffleClient/proxy/src/util.h index ae09db684..640803f41 100644 --- a/waffleClient/proxy/src/util.h +++ b/waffleClient/proxy/src/util.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 9/19/19. -// - #ifndef WAFFLE_UTIL_H #define WAFFLE_UTIL_H diff --git a/waffleClient/proxy/src/waffle_proxy.cpp b/waffleClient/proxy/src/waffle_proxy.cpp index 77a6aaee2..1fb7d48f9 100644 --- a/waffleClient/proxy/src/waffle_proxy.cpp +++ b/waffleClient/proxy/src/waffle_proxy.cpp @@ -117,7 +117,7 @@ void waffle_proxy::init(const std::vector &keys, const std::vector< } // Initialising Cache - size_t cacheCapacity = cacheBatches*B; + size_t cacheCapacity = cacheBatches*1000000/100; std::unordered_set temp; std::vector valuesCache; while(keysCacheUnencrypted.size() < cacheCapacity) { @@ -200,13 +200,13 @@ void waffle_proxy::init(const std::vector &keys, const std::vector< date_string = date_string.substr(0, date_string.rfind(":")); date_string.erase(remove(date_string.begin(), date_string.end(), ' '), date_string.end()); if(latency) { - std::string output_directory_bst_latency = "data/"+std::string("BST_Latency_")+date_string; + std::string output_directory_bst_latency = "/home/svemula/tmp/BST_Latency"; _mkdirProxy((output_directory_bst_latency).c_str()); - std::string output_directory_redis_latency = "data/"+std::string("Redis_Latency_")+date_string; + std::string output_directory_redis_latency = "/home/svemula/tmp/Redis_Latency"; _mkdirProxy((output_directory_redis_latency).c_str()); - std::string output_directory_cache_miss = "data/"+std::string("Cache_miss_")+date_string; + std::string output_directory_cache_miss = "/home/svemula/tmp/Cache_miss"; _mkdirProxy((output_directory_cache_miss).c_str()); out_bst_latency = std::ofstream(output_directory_bst_latency+"/1"); @@ -281,7 +281,7 @@ void waffle_proxy::execute_batch(const std::vector &operations, std:: rdtscllProxy(start); } - // std::cout << "r is " << operations.size() << std::endl; + // std::cout << "r is " << operations.size() << " f_r is " << B-(operations.size()+F) << std::endl; for(int i = 0; i < operations.size(); i++){ std::string key = operations[i].key; auto stKey = enc_engine->prf(key + "#" + std::to_string(realBst.getFrequency(key))); diff --git a/waffleClient/proxy/src/waffle_proxy.h b/waffleClient/proxy/src/waffle_proxy.h index 65b2cf4ea..40623bbf4 100644 --- a/waffleClient/proxy/src/waffle_proxy.h +++ b/waffleClient/proxy/src/waffle_proxy.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 8/29/19. -// - #ifndef WAFFLE_PROXY_H #define WAFFLE_PROXY_H @@ -72,7 +68,7 @@ class waffle_proxy : public proxy { std::string output_location_ = "log"; std::string trace_location_ = ""; - std::string server_host_name_ = "192.168.152.110"; + std::string server_host_name_ = "192.168.252.110"; int server_port_ = 6379; int security_batch_size_ = 3; int object_size_ = 1024; diff --git a/waffleClient/server/src/proxy_server.cpp b/waffleClient/server/src/proxy_server.cpp index 7e9e57aca..56ecd2b95 100644 --- a/waffleClient/server/src/proxy_server.cpp +++ b/waffleClient/server/src/proxy_server.cpp @@ -1,8 +1,3 @@ -// -// Created by Lloyd Brown on 10/5/19. -// - - #include #include diff --git a/waffleClient/service/src/thrift_handler.cpp b/waffleClient/service/src/thrift_handler.cpp index 6f4b1facf..5a9a88f50 100644 --- a/waffleClient/service/src/thrift_handler.cpp +++ b/waffleClient/service/src/thrift_handler.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/3/19. -// - #include "thrift_handler.h" using namespace ::apache::thrift; diff --git a/waffleClient/service/src/thrift_handler.h b/waffleClient/service/src/thrift_handler.h index f30ed603e..900bb8b58 100644 --- a/waffleClient/service/src/thrift_handler.h +++ b/waffleClient/service/src/thrift_handler.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/3/19. -// - #ifndef WAFFLE_THRIFT_HANDLER_H #define WAFFLE_THRIFT_HANDLER_H #include "waffle_thrift.h" diff --git a/waffleClient/service/src/thrift_handler_factory.cpp b/waffleClient/service/src/thrift_handler_factory.cpp index b53fa6641..1ad5b9e5e 100644 --- a/waffleClient/service/src/thrift_handler_factory.cpp +++ b/waffleClient/service/src/thrift_handler_factory.cpp @@ -1,6 +1,3 @@ -// -// Created by Lloyd Brown on 10/5/19. -// #include "thrift_handler_factory.h" using namespace ::apache::thrift; diff --git a/waffleClient/service/src/thrift_handler_factory.h b/waffleClient/service/src/thrift_handler_factory.h index 649c9f7bb..68873a7e2 100644 --- a/waffleClient/service/src/thrift_handler_factory.h +++ b/waffleClient/service/src/thrift_handler_factory.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/5/19. -// - #ifndef WAFFLE_THRIFT_HANDLER_FACTORY_H #define WAFFLE_THRIFT_HANDLER_FACTORY_H diff --git a/waffleClient/service/src/thrift_server.cpp b/waffleClient/service/src/thrift_server.cpp index 17eac095d..cacbaf297 100644 --- a/waffleClient/service/src/thrift_server.cpp +++ b/waffleClient/service/src/thrift_server.cpp @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/5/19. -// - #include "thrift_server.h" using namespace ::apache::thrift; diff --git a/waffleClient/service/src/thrift_server.h b/waffleClient/service/src/thrift_server.h index 2ebd07cd8..98b8d87dd 100644 --- a/waffleClient/service/src/thrift_server.h +++ b/waffleClient/service/src/thrift_server.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/5/19. -// - #ifndef WAFFLE_THRIFT_SERVER_H #define WAFFLE_THRIFT_SERVER_H diff --git a/waffleClient/service/src/thrift_utils.h b/waffleClient/service/src/thrift_utils.h index 138e0ff8b..966bcb74d 100644 --- a/waffleClient/service/src/thrift_utils.h +++ b/waffleClient/service/src/thrift_utils.h @@ -1,7 +1,3 @@ -// -// Created by Lloyd Brown on 10/6/19. -// - #ifndef PANCAKE_THRIFT_UTILS_H #define PANCAKE_THRIFT_UTILS_H