- Update multicast:

	* Remove recv thread
	* Update logs to LOG api
	* Retransmit Initial message if master not ready
	* Assert if packets lost -> break the execution if there is a drift in slots

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4006 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair1/SIMULATION/ETH_TRANSPORT/defs.h

 /*! \file phy_emulation.h
-* \brief specifies the data structure and variable for phy emulation
-* \author Navid Nikaein, Raymomd Knopp  and Hicham Anouar
-* \date 2011
-* \version 1.0 
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-*/ 
-
-
-//#include "SCHED/defs.h"
-#include "proto.h"
-//#include "UTIL/OCG/OCG.h"
-
+ *  \brief specifies the data structure and variable for phy emulation
+ *  \author Navid Nikaein, Raymomd Knopp  and Hicham Anouar
+ *  \date 2011
+ *  \version 1.1
+ *  \company Eurecom
+ *  \email: navid.nikaein@eurecom.fr
+ */
 
 #ifndef __BYPASS_SESSION_LAYER_DEFS_H__
 #    define __BYPASS_SESSION_LAYER_DEFS_H__
 //-----------------------------------------------------------------------------
 //#include "openair_defs.h"
 
-#define WAIT_PM_TRANSPORT_INFO 0x1
-#define WAIT_SM_TRANSPORT_INFO 0x2
-#define SYNC_TRANSPORT_INFO 0x3
-#define ENB_TRANSPORT_INFO 0X4
-#define UE_TRANSPORT_INFO 0X5
-#define RELEASE_TRANSPORT_INFO 0x6
+typedef enum {
+    EMU_TRANSPORT_INFO_ERROR    = 0x0,
+    EMU_TRANSPORT_INFO_WAIT_PM,
+    EMU_TRANSPORT_INFO_WAIT_SM,
+    EMU_TRANSPORT_INFO_SYNC,
+    EMU_TRANSPORT_INFO_ENB,
+    EMU_TRANSPORT_INFO_UE,
+    EMU_TRANSPORT_INFO_RELEASE
+} emu_transport_info_t;
 
 #define WAIT_PM_TRANSPORT 1
 #define WAIT_SM_TRANSPORT 2
@@ -41,10 +38,11 @@
 #define BYPASS_RX_BUFFER_SIZE 64000
 #define BYPASS_TX_BUFFER_SIZE 64000
 
+typedef unsigned int (*tx_handler_t) (unsigned char, char*, unsigned int*, unsigned int*);
+typedef unsigned int (*rx_handler_t) (unsigned char, char*, unsigned int);
 
 /*************************************************************/
 
-
 typedef struct  {
   u32 pbch_flag:1;
   u32 pss:2;
@@ -71,8 +69,10 @@ typedef struct  {
   u8 prach_flag:1;  // 0=none,1=active
   u8 prach_id:6;    // this is the PHY preamble index for the prach
 } UE_cntl;
+
 #define MAX_TRANSPORT_BLOCKS_BUFFER_SIZE 16384
 #define MAX_NUM_DCI 5
+
 typedef struct {
   eNB_cntl cntl;
   u8 num_common_dci;
@@ -85,15 +85,6 @@ typedef struct {
   u8 transport_blocks[MAX_TRANSPORT_BLOCKS_BUFFER_SIZE]; 
 } __attribute__ ((__packed__)) eNB_transport_info_t ;
 
-/*typedef struct {
-  eNB_cntl cntl;
-  u8 num_common_dci;
-  u8 num_ue_spec_dci;
-  DCI_ALLOC_t dci_alloc;
-  u8 dlsch_info[6*MAX_NUM_DCI + MAX_TRANSPORT_BLOCKS_BUFFER_SIZE];
-} eNB_transport_info_rx_t ;
-*/
-
 typedef struct {
   UE_cntl cntl;
   u8 num_eNB;
@@ -114,53 +105,11 @@ typedef struct bypass_msg_header {
   unsigned int   nb_flow; /*! \brief */
   unsigned int   frame;
   unsigned int   subframe;
+  uint64_t       seq_num;
 }__attribute__ ((__packed__)) bypass_msg_header_t;
 
 typedef struct bypass_proto2multicast_header_t {
   unsigned int      size;
 } bypass_proto2multicast_header_t;
 
-
-/* // replaced to OCG.h
-#define NUMBER_OF_MASTER_MAX   20
-//#define NUMBER_OF_UE_MAX 32
-
-
-typedef struct {
-  unsigned char nb_ue;
-  unsigned char first_ue;
-  unsigned char nb_enb;
-  unsigned char first_enb;
-}master_info_t;
-
-typedef struct {
-  master_info_t master[NUMBER_OF_MASTER_MAX];
-  unsigned char nb_ue_local;
-  unsigned char nb_ue_remote;
-  unsigned char nb_enb_local;
-  unsigned char nb_enb_remote;
-  unsigned char first_enb_local;
-  unsigned char first_ue_local;
-  unsigned short master_id;
-  unsigned char nb_master;
-  unsigned int master_list;
-  unsigned int is_primary_master;
-  unsigned int ethernet_flag;
-  char local_server[128]; // for the oaisim -c option : 0 = EURECOM web portal; -1 = local; 1 - N or filename = running a specific XML configuration file 
-  unsigned int offset_ue_inst;
-  unsigned char multicast_group;
-  unsigned char ocg_enabled;
-  unsigned char opt_enabled;
-  unsigned char otg_enabled;
-  unsigned char omg_model_enb;
-  unsigned char omg_model_ue;
-  unsigned int seed;
-  double time;	
-
-}emu_info_t; 
-*/
-
-
-#endif //
-
-
+#endif /* __BYPASS_SESSION_LAYER_DEFS_H__ */

openair1/SIMULATION/ETH_TRANSPORT/extern.h

 /*! \file extern.h
-* \brief specifies the extern variables for phy emulation
-* \author Navid Nikaein and Raymomd Knopp and Hicham Anouar
-* \date 2011
-* \version 1.0 
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-*/ 
+ *  \brief specifies the extern variables for phy emulation
+ *  \author Navid Nikaein and Raymomd Knopp and Hicham Anouar
+ *  \date 2011
+ *  \version 1.1
+ *  \company Eurecom
+ *  \email: navid.nikaein@eurecom.fr
+ */
 
 #ifndef __BYPASS_SESSION_LAYER_EXTERN_H__
 #    define __BYPASS_SESSION_LAYER_EXTERN_H__
@@ -23,16 +23,17 @@ extern unsigned char emu_rx_status;
 //extern unsigned short Master_id;
 //extern unsigned int Is_primary_master;
 
+#if !defined(ENABLE_NEW_MULTICAST)
 extern pthread_mutex_t emul_low_mutex;
 extern pthread_cond_t emul_low_cond;
 extern char emul_low_mutex_var;
 extern pthread_mutex_t Tx_mutex;
 extern pthread_cond_t Tx_cond;
 extern char Tx_mutex_var;
+#endif
 
-
-extern int (*rx_handler) (unsigned char,char*,int);
-extern int (*tx_handler) (unsigned char,char*, unsigned int*, unsigned int*);
+extern rx_handler_t rx_handler;
+extern tx_handler_t tx_handler;
 
 extern eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX];
 extern u16 eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX];

openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h

 /*! \file multicast.h
-* \brief 
-* \author Lionel Gauthier and Navid Nikaein 
-* \date 2011
-* \version 1.0 
-* \company Eurecom
-* \email: navid.nikaein@eurecom.fr
-*/ 
+ *  \brief
+ *  \author Lionel Gauthier and Navid Nikaein 
+ *  \date 2011
+ *  \version 1.1
+ *  \company Eurecom
+ *  \email: navid.nikaein@eurecom.fr
+ */
 
 #ifndef __MULTICAST_LINK_H__
 #    define __MULTICAST_LINK_H__
@@ -18,27 +18,24 @@
 #    endif
 #    include "stdint.h"
 
-
-
 private_multicast_link (typedef struct multicast_group_t {
   int      socket;
+  struct sockaddr_in sock_remote_addr;
   char     host_addr[16];
   uint16_t port;
-  struct sockaddr_in sock_remote_addr;  
   char     rx_buffer[40000];
 } multicast_group_t;)
 
-
 private_multicast_link(void  multicast_link_init ());
 private_multicast_link(void  multicast_link_read_data (int groupP));
 private_multicast_link(void  multicast_link_read ());
 private_multicast_link(void *multicast_link_main_loop (void *param));
 
 public_multicast_link(int   multicast_link_write_sock (int groupP, char *dataP, uint32_t sizeP));
-public_multicast_link( void  multicast_link_start (  void (*rx_handlerP) (unsigned int, char*), unsigned char multicast_group, char * multicast_ifname));
-#ifdef BYPASS_PHY
-public_multicast_link( pthread_mutex_t Bypass_phy_wr_mutex);
-public_multicast_link( pthread_cond_t Bypass_phy_wr_cond);
-public_multicast_link( char Bypass_phy_wr);
-#endif //BYPASS_PHY
+public_multicast_link(void  multicast_link_start (  void (*rx_handlerP) (unsigned int, char*), unsigned char multicast_group, char * multicast_ifname));
+# ifdef BYPASS_PHY
+public_multicast_link(pthread_mutex_t Bypass_phy_wr_mutex);
+public_multicast_link(pthread_cond_t Bypass_phy_wr_cond);
+public_multicast_link(char Bypass_phy_wr);
+# endif //BYPASS_PHY
 #endif

openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c

@@ -25,14 +25,12 @@ struct msghdr nas_msg;
 
 #define GRAAL_NETLINK_ID 31
 
-int netlink_init(void) {
-
-
+int netlink_init(void)
+{
     int ret;
 
-  
     nas_sock_fd = socket(PF_NETLINK, SOCK_RAW,GRAAL_NETLINK_ID);
-  if (nas_sock_fd==-1) {
+    if (nas_sock_fd == -1) {
         printf("[NETLINK] Error opening socket %d\n",nas_sock_fd);
         return(-1);
     }
@@ -45,7 +43,7 @@ int netlink_init(void) {
     nas_src_addr.nl_family = AF_NETLINK;
     nas_src_addr.nl_pid = 1;//getpid();  /* self pid */
     nas_src_addr.nl_groups = 0;  /* not in mcast groups */
-  ret = bind(nas_sock_fd, (struct sockaddr*)&nas_src_addr,
+    ret = bind(nas_sock_fd, (struct sockaddr *)&nas_src_addr,
                sizeof(nas_src_addr));
 
     printf("[NETLINK] bind returns %d\n",ret);
@@ -69,18 +67,8 @@ int netlink_init(void) {
     nas_msg.msg_iov = &nas_iov;
     nas_msg.msg_iovlen = 1;
 
-  
     /* Read message from kernel */
     memset(nas_nlh, 0, NLMSG_SPACE(MAX_PAYLOAD));
 
-
     return(nas_sock_fd);
 }
-
-
-
-
-
-
-
-

openair1/SIMULATION/ETH_TRANSPORT/proto.h

@@ -7,10 +7,16 @@
 * \email: navid.nikaein@eurecom.fr
 */
 
+#include "SIMULATION/ETH_TRANSPORT/defs.h"
+
+#ifndef EMU_PROTO_H_
+#define EMU_PROTO_H_
+
 void init_bypass (void);
 void bypass_init ( unsigned int (*tx_handlerP) (unsigned char,char*, unsigned int*, unsigned int*),unsigned int (*rx_handlerP) (unsigned char,char*,unsigned int));
-int bypass_rx_data (unsigned int frame, unsigned int last_slot, unsigned int next_slot);
-void  bypass_signal_mac_phy(unsigned int frame, unsigned int last_slot, unsigned int next_slot);
+int bypass_rx_data (unsigned int frame, unsigned int last_slot, unsigned int next_slot, uint8_t is_master);
+void  bypass_signal_mac_phy(unsigned int frame, unsigned int last_slot,
+                            unsigned int next_slot, uint8_t is_master);
 #ifndef USER_MODE
 int multicast_link_write_sock (int groupP, char *dataP, unsigned int sizeP);
 int bypass_tx_handler(unsigned int fifo, int rw);
@@ -19,7 +25,7 @@ int bypass_rx_handler(unsigned int fifo, int rw);
 void bypass_rx_handler(unsigned int Num_bytes,char *Rx_buffer);
 #endif
 
-void bypass_tx_data (char Type, unsigned int frame, unsigned int next_slot);
+void bypass_tx_data (emu_transport_info_t Type, unsigned int frame, unsigned int next_slot);
 
 void emulation_tx_rx(void);
 
@@ -37,7 +43,10 @@ void emu_transport_DL(unsigned int frame, unsigned int last_slot,unsigned int ne
 void emu_transport_UL(unsigned int frame, unsigned int last_slot,unsigned int next_slot);
 void emu_transport_release(void);
 
+int multicast_link_read_data_from_sock(uint8_t eNB_flag);
+
 void clear_eNB_transport_info(u8);
 void clear_UE_transport_info(u8);
 int netlink_init(void);
 
+#endif /* EMU_PROTO_H_ */

openair1/SIMULATION/ETH_TRANSPORT/vars.h

@@ -24,15 +24,18 @@ unsigned char emu_rx_status;
 //unsigned short Master_id;
 //unsigned int Is_primary_master;
 
+#if !defined(ENABLE_NEW_MULTICAST)
 pthread_mutex_t emul_low_mutex;
 pthread_cond_t emul_low_cond;
 char emul_low_mutex_var;
 pthread_mutex_t Tx_mutex;
 pthread_cond_t Tx_cond;
 char Tx_mutex_var;
+#endif
 
-int (*rx_handler) (unsigned char,char*,int);
-int (*tx_handler) (unsigned char,char*, unsigned int*, unsigned int*);
+/* Handlers for RX and TX */
+rx_handler_t rx_handler;
+tx_handler_t tx_handler;
 
 eNB_transport_info_t eNB_transport_info[NUMBER_OF_eNB_MAX];
 u16 eNB_transport_info_TB_index[NUMBER_OF_eNB_MAX];

openair2/UTIL/assertions.h

+/*******************************************************************************
+
+  Eurecom OpenAirInterface
+  Copyright(c) 1999 - 2012 Eurecom
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms and conditions of the GNU General Public License,
+  version 2, as published by the Free Software Foundation.
+
+  This program is distributed in the hope it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+  The full GNU General Public License is included in this distribution in
+  the file called "COPYING".
+
+  Contact Information
+  Openair Admin: openair_admin@eurecom.fr
+  Openair Tech : openair_tech@eurecom.fr
+  Forums       : http://forums.eurecom.fr/openairinterface
+  Address      : EURECOM, Campus SophiaTech, 450 Route des Chappes
+                 06410 Biot FRANCE
+
+*******************************************************************************/
+#include <stdio.h>
+
+#ifndef ASSERTIONS_H_
+#define ASSERTIONS_H_
+
+#define DevCheck(cOND, vALUE1, vALUE2, vALUE3)                          \
+do {                                                                    \
+    if (!(cOND)) {                                                      \
+        fprintf(stderr, "%s:%d:%s Assertion `"#cOND"` failed.\n",       \
+                __FILE__, __LINE__, __FUNCTION__);                      \
+        fprintf(stderr, #vALUE1": %d\n"#vALUE2": %d\n"#vALUE3": %d\n",  \
+        (int)vALUE1, (int)vALUE2, (int)vALUE3);                         \
+        abort();                                                        \
+    }                                                                   \
+} while(0)
+
+#define DevCheck4(cOND, vALUE1, vALUE2, vALUE3, vALUE4)                 \
+do {                                                                    \
+    if (!(cOND)) {                                                      \
+        fprintf(stderr, "%s:%d:%s Assertion `"#cOND"` failed.\n",       \
+                __FILE__, __LINE__, __FUNCTION__);                      \
+        fprintf(stderr, #vALUE1": %d\n"#vALUE2": %d\n"#vALUE3": %d\n"   \
+        #vALUE4": %d\n",                                                \
+        (int)vALUE1, (int)vALUE2, (int)vALUE3, (int)vALUE4);            \
+        exit(EXIT_FAILURE);                                             \
+    }                                                                   \
+} while(0)
+
+#define DevParam(vALUE1, vALUE2, vALUE3)    \
+    DevCheck(0 == 1, vALUE1, vALUE2, vALUE3)
+
+#define DevAssert(cOND)                                                 \
+do {                                                                    \
+    if (!(cOND))    {                                                   \
+        fprintf(stderr, "%s:%d:%s Assertion `"#cOND"` failed.\n",       \
+        __FILE__, __LINE__, __FUNCTION__);                              \
+        abort();                                                        \
+    }                                                                   \
+} while(0)
+
+#define DevMessage(mESSAGE)                                             \
+do {                                                                    \
+    fprintf(stderr, "%s:%d:%s Execution interrupted: `"#mESSAGE"`.\n",  \
+    __FILE__, __LINE__, __FUNCTION__);                                  \
+    abort();                                                            \
+} while(0)
+
+#endif /* ASSERTIONS_H_ */

targets/SIMU/USER/Makefile

@@ -218,6 +218,7 @@ CFLAGS +=-DPROC
 endif
 
 CFLAGS += -DENABLE_VCD_FIFO
+CFLAGS += -DENABLE_NEW_MULTICAST
 # CFLAGS += -DENABLE_LOG_FIFO
 
 OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(ETHERNET_TRANSPORT_OBJS) $(TOOLS_OBJS) $(SCHED_OBJS) $(STATS_OBJS) $(OAISIM_OBJS) $(NAS_OBJS) $(INT_OBJS) $(UTIL_OBJ)