rename normal tcp sendfile (one copy); rewrote normal tcp

offloading_binaries/Normal/main.c

@@ -1,126 +0,0 @@
-/*
- * Initial commit by Yibo @ Jul. 28, 2015
- * Last update by Yanzi @ Sept. 23, 2016
- */
-
-#include <arpa/inet.h>
-#include <linux/if_packet.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/ether.h>
-#include <sys/sendfile.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#define ETH_P_IP        0x0800      /* Internet Protocol packet */
-#define ETH_ALEN        6       /* from <net/ethernet.h> */
-#define ETH_P_ALL       0x0003
-
-#define MY_DEST_MAC0    0xba
-#define MY_DEST_MAC1    0xf6
-#define MY_DEST_MAC2    0xb1
-#define MY_DEST_MAC3    0x71
-#define MY_DEST_MAC4    0x09
-#define MY_DEST_MAC5    0x64
- 
-#define DEFAULT_IF      "wlan0"
-#define BUF_SIZ         8192
- 
-int main(int argc, char *argv[])
-{
-    int slotLength = 10000; // in microseconds
-    int quota = 1000000000; // Bytes per slot, default 1GB/slot
-    int sentInSlot = 0, slot = 1;
-    double elapsedTime;
-    
-    struct iovec iov;
-    int sockfd;
-    struct ifreq if_idx;
-    struct ifreq if_mac;
-    int tx_len = 0;
-    char sendbuf[BUF_SIZ];
-    struct ether_header *eh = (struct ether_header *) sendbuf;
-    struct iphdr *iph = (struct iphdr *) (sendbuf + sizeof(struct ether_header));
-    struct sockaddr_ll socket_address;
-    char ifName[IFNAMSIZ];
-    int i, j, ret, sendsize=1488, packet_num, offset = 0;
-    int fd;                    /* file descriptor for file to send */
-    struct timeval t_start,t_end,t_now;
-    
-    struct sockaddr_in servaddr;
-
-    if (argc > 1)
-        packet_num = atoi(argv[1]);
-    else
-        packet_num = 166666*sendsize;
-    
-    if (argc > 2)
-        quota = atoi(argv[2]) / (1000000 / slotLength);
-    
-    sockfd = socket(AF_INET, SOCK_STREAM, 0);
-
-    bzero(&servaddr,sizeof(servaddr));
-    servaddr.sin_family = AF_INET;
-    servaddr.sin_addr.s_addr=inet_addr("10.0.0.169");
-    servaddr.sin_port=htons(4444);
-
-
-
-    fd = open("/data/local/tmp/bigfile", O_RDONLY);
-    if (fd == -1) {
-        fprintf(stderr, "unable to open the file.\n");
-        exit(1);
-    }
-    
-    gettimeofday(&t_start, NULL);
-    if (connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
-    {
-        fprintf(stderr, "unable to connect the server.\n");
-        exit(1);
-    }
-    while (offset < packet_num)
-    {
-        if ((packet_num - offset) < quota)
-        {
-            quota = packet_num - offset;            
-        }
-        while (sentInSlot < quota)
-        {   
-            read(fd, sendbuf, (quota - sentInSlot < 4096) ? quota - sentInSlot : 4096);
-            ret = send(sockfd, sendbuf, (quota - sentInSlot < 4096) ? quota - sentInSlot : 4096, 0);
-//          printf("%d\t%d\n", ret, errno);
-            if (ret <= 0)
-            {
-                printf("send fail\n");
-                usleep(100);
-                continue;
-            }
-            offset += ret;
-            sentInSlot = sentInSlot + ret;
-        }
-        gettimeofday(&t_now, NULL);
-        elapsedTime = (t_now.tv_sec-t_start.tv_sec)*1000000.0+(t_now.tv_usec-t_start.tv_usec);
-        if (elapsedTime < slotLength * slot)
-        {
-            //printf("sent %d, quota %d, packet_num %d, usleep %lf\n", offset, quota, packet_num, slotLength * slot - elapsedTime);
-            usleep((int)(slotLength * slot - elapsedTime));
-        }
-        sentInSlot = 0;
-        slot++;
-
-    }
-    close(sockfd);
-    gettimeofday(&t_end, NULL);
-    printf("%lf\n", (t_end.tv_sec-t_start.tv_sec)*1000.0+(t_end.tv_usec-t_start.tv_usec)/1000.0);
-    
-    close(fd);
-    
-//    moncleanup();
-    return 0;
-}

offloading_binaries/c2s_normaltcp/Makefile

@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
 # CC = gcc
 CFLAGS = -pie -fPIE
-TARGET = c2s_sendfile
+TARGET = c2s_normaltcp
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)

offloading_binaries/c2s_normaltcp/main.c

@@ -0,0 +1,183 @@
+/*
+ * Initial commit by Yibo @ Jul. 28, 2015
+ * Last update by Yanzi @ Sept. 26, 2016
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <linux/if_packet.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <net/if.h>
+#include <netinet/ether.h>
+#include <sys/sendfile.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <fcntl.h>
+
+// #define ETH_P_IP        0x0800      /* Internet Protocol packet */
+// #define ETH_ALEN        6       /* from <net/ethernet.h> */
+// #define ETH_P_ALL       0x0003
+
+// #define MY_DEST_MAC0    0xba
+// #define MY_DEST_MAC1    0xf6
+// #define MY_DEST_MAC2    0xb1
+// #define MY_DEST_MAC3    0x71
+// #define MY_DEST_MAC4    0x09
+// #define MY_DEST_MAC5    0x64
+ 
+// #define DEFAULT_IF      "wlan0"
+#define BUF_SIZ         8192
+
+char isNumber(char number[])
+{
+    int i = 0;
+
+    //checking for negative numbers
+    if (number[0] == '-')
+        i = 1;
+    for (; number[i] != 0; i++)
+    {
+        //if (number[i] > '9' || number[i] < '0')
+        if (!isdigit(number[i]))
+            return 0;
+    }
+    return 1;
+}
+
+int main(int argc, char *argv[])
+{
+    // defaults
+    uint slotLength = 10000; // in microseconds, for bandwidth control
+    uint quota = 1000000000; // default bytes per slot, default 1GB/slot
+    uint sentInSlot = 0, slot = 1;
+    uint total_bytes_sent = 0;
+    // for timing
+    double elapsedTime;
+    struct timeval t_start, t_end, t_now;
+    // for socket
+    int fd; // file descriptor of file to send
+    int sockfd; // socket 
+    // int sendsize = 1488;
+    // char ifName[IFNAMSIZ];
+    char sendbuf[BUF_SIZ];
+    struct sockaddr_in servaddr;
+    struct ether_header *eh = (struct ether_header *) sendbuf;
+    struct iphdr *iph = (struct iphdr *) (sendbuf + sizeof(struct ether_header));
+    // struct sockaddr_ll socket_address;
+    // for misc
+    int i, j, ret;
+    int bytes2send = 0;
+    struct stat st;
+
+    if (argc < 4)
+    {
+        printf("Usage: %s <bytes2send/file2send> <ip> <port> <[optional] bandwidth (bps)>\n", argv[0]);
+        exit(0);
+    }
+
+    // set bandwidth
+    if (argc > 4)
+        quota = atoi(argv[4]) / 8 / (1000000 / slotLength);
+
+    // get file size (bytes2send)
+    if (isNumber(argv[1]))
+    {
+        // set bytes to send
+        bytes2send = atoi(argv[1]);
+        // open file descriptor
+        fd = open("/data/local/tmp/bigfile", O_RDONLY);
+        if (fd == -1)
+        {
+            fprintf(stderr, "! Unable to open /data/local/tmp/bigfile.\n");
+            exit(1);
+        }
+    }
+    else
+    {
+        // open file descriptor
+        fd = open(argv[1], O_RDONLY);
+        if (fd == -1)
+        {
+            fprintf(stderr, "! Unable to open file %s.\n", argv[1]);
+            exit(1);
+        }
+        fstat(fd, &st);
+        bytes2send = st.st_size;
+        printf("bytes2send:%d\n", bytes2send);
+    }
+
+    // bind socket
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    bzero(&servaddr, sizeof(servaddr));
+    servaddr.sin_family = AF_INET;
+    servaddr.sin_addr.s_addr = inet_addr(argv[2]);
+    servaddr.sin_port = htons(atoi(argv[3]));
+
+    // connect socket
+    if (connect(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) < 0)
+    {
+        fprintf(stderr, "! Unable to connect the server.\n");
+        exit(1);
+    }
+
+    // start timing
+    gettimeofday(&t_start, NULL);
+
+    // start to send
+    while (total_bytes_sent < bytes2send)
+    {
+        if ((bytes2send - total_bytes_sent) < quota)
+        {
+            quota = bytes2send - total_bytes_sent;
+        }
+        // send in slots
+        while (sentInSlot < quota)
+        {
+            // printf(
+            //     "before: total_bytes_sent %d, sentInSlot %d, quota - sentInSlot %d\n",
+            //     total_bytes_sent, sentInSlot, quota - sentInSlot);
+            read(fd, sendbuf, (quota - sentInSlot < 4096) ? (quota - sentInSlot) : 4096);
+            ret = send(sockfd, sendbuf, (quota - sentInSlot < 4096) ? (quota - sentInSlot) : 4096, 0);
+
+            if (ret <= 0)
+            {
+                fprintf(stderr, "! Fail to send: ret:%d, err:%d; wait for 100us..\n", ret, errno);
+                usleep(100);
+                continue;
+            }
+            total_bytes_sent += ret;
+            sentInSlot += ret;
+            // printf(
+            //     "after: total_bytes_sent %d, sentInSlot %d, quota - sentInSlot %d\n",
+            //     total_bytes_sent, sentInSlot, quota - sentInSlot);
+        }
+        // control bandwidth
+        gettimeofday(&t_now, NULL);
+        elapsedTime = (t_now.tv_sec - t_start.tv_sec) * 1000000.0 + (t_now.tv_usec - t_start.tv_usec);
+        if (elapsedTime < slotLength * slot)
+        {
+            // printf(
+            //     "sent %d, quota %d, bytes2send %d, usleep %lfus\n",
+            //     total_bytes_sent, quota, bytes2send, slotLength * slot - elapsedTime);
+            usleep((int)(slotLength * slot - elapsedTime));
+        }
+        sentInSlot = 0;
+        ++slot;
+    }
+
+    // end timing
+    gettimeofday(&t_end, NULL);
+    elapsedTime = (t_end.tv_sec - t_start.tv_sec) + (t_end.tv_usec - t_start.tv_usec) / 1000000.0;
+    printf("duration(s):%lf\nthroughput(bps):%lf\n", elapsedTime, total_bytes_sent * 8 / elapsedTime);
+    
+    close(sockfd);
+    close(fd);
+    
+    return 0;
+}

offloading_binaries/c2s_normaltcp_sendfile/Makefile

@@ -1,7 +1,7 @@
 CC = arm-linux-androideabi-gcc
-CFLAGS = -pie -fPIE -llog
+# CC = gcc
-#STATICLIB = -llog -l/media/Lucifer/android/ndk-profiler/obj/local/armeabi-v7a/libandroid-ndk-profiler.a
+CFLAGS = -pie -fPIE
-TARGET = normal
+TARGET = c2s_normaltcp_sendfile
 
 OBJS = $(patsubst %.c, %.o, $(wildcard *.c))
 HEADERS = $(wildcard *.h)
@@ -15,9 +15,7 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(CC) $(OBJS) -Wall $(CFLAGS) -o $@
-	cp $(TARGET) /media/Lucifer/yanzi/projects/offloading/RDMAMobileDemo/app/src/main/assets/
+
 clean:
 	-rm -f *.o
 	-rm -f $(TARGET)
-
-#$(call import-module,android-ndk-profiler)

offloading_binaries/c2s_normaltcp_sendfile/main.c

@@ -1,6 +1,7 @@
 /*
  * Initial commit by Yibo @ Jul. 28, 2015
  * Last update by Yanzi @ Sept. 26, 2016
+ * This is using sendfile to achieve zero-copy (one copy actually due to lack of driver support).
  *
  * TODO: "Presently (Linux 2.6.9 [and, in fact, as of this writing in June 2010]): in_fd, must
  * correspond to a file which supports mmap()-like operations (i.e., it cannot be a socket);
@@ -39,7 +40,7 @@
  
 // #define DEFAULT_IF  "lo"
 // #define BUF_SIZ     8192
- 
+
 char isNumber(char number[])
 {
     int i = 0;
@@ -70,9 +71,9 @@ int main(int argc, char *argv[])
     int fd; // file descriptor of file to send
     int sockfd; // socket 
     // int sendsize = 1488;
-    char ifName[IFNAMSIZ];
+    // char ifName[IFNAMSIZ];
     struct sockaddr_in servaddr;
-    struct sockaddr_ll socket_address;
+    // struct sockaddr_ll socket_address;
     // for misc
     int i, j, ret;
     int bytes2send = 0;
@@ -171,6 +172,7 @@ int main(int argc, char *argv[])
         ++slot;
     }
 
+    // end timing
     gettimeofday(&t_end, NULL);
     elapsedTime = (t_end.tv_sec - t_start.tv_sec) + (t_end.tv_usec - t_start.tv_usec) / 1000000.0;
     printf("duration(s):%lf\nthroughput(bps):%lf\n", elapsedTime, total_bytes_sent * 8 / elapsedTime);