Changeset 36

Show
Ignore:
Timestamp:
05/30/08 09:57:31 (6 months ago)
Author:
jtang
Message:

Re-indented.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libsipc/Makefile

    r34 r36  
    3535ALL_SUBDIRS = src include bindings/java examples man tests 
    3636 
    37 C_INDENT_OPTS   = -npro -nbad -bap -nbbb -nbbo -nbc -br -bli0 -bls -c40 -cbi0 -cd40 -cdw  -ce -ci8 -cli0 -cp40 -ncs -d0 -nbfda -di1 -nfc1 -nfca -i8 -ip0 -l132 -lp -nlps -npcs -pi0 -nprs -npsl -saf -sai -sbi0 -sob -ss -ts8 -ut 
     37C_INDENT_OPTS   = -npro -nbad -bap -nbbb -nbbo -nbc -br -bli0 -bls -c40 -cbi0 -cd40 -cdw  -ce -ci8 -cli0 -cp40 -ncs -d0 -nbfda -di1 -nfc1 -nfca -i8 -ip0 -l132 -lp -nlps -npcs -pi0 -nprs -npsl -saf -sai -sbi0 -sob -ss -ts8 -ut -T sipc_t 
    3838 
    3939all: 

  • trunk/libsipc/include/sipc/sipc.h

    r35 r36  
    5656 
    5757/* Free the sipc struct and its contents */ 
    58 void sipc_close(sipc_t * sipc); 
     58void sipc_close(sipc_t *sipc); 
    5959 
    6060/* Called by a helper application to destroy an IPC resource. 
    …… 
    6565 * This can only be called if sender was specified when sipc_init was called.  
    6666 * returns 0 on success, <0 on failure */ 
    67 int sipc_send_data(sipc_t * sipc, int msg_len); 
     67int sipc_send_data(sipc_t *sipc, int msg_len); 
    6868 
    6969/* Blocking call to recieve data. Data will be allocated and filled and 
    7070 * len will be set to the length. Returns 0 on success, <0 on failure */ 
    71 int sipc_recv_data(sipc_t * sipc, char **data, int *len); 
     71int sipc_recv_data(sipc_t *sipc, char **data, int *len); 
    7272 
    7373/* Returns a pointer to the data contained within the IPC resource */ 
    74 char *sipc_get_data_ptr(sipc_t * sipc); 
     74char *sipc_get_data_ptr(sipc_t *sipc); 
    7575 
    7676/* Prints an error message, accepts printf format string */ 
    77 void sipc_error(sipc_t * sipc, const char *fmt, ...) 
     77void sipc_error(sipc_t *sipc, const char *fmt, ...) 
    7878        __attribute__ ((format(printf, 2, 3))); 
    7979 
    …… 
    8282 
    8383/* Receiver calls this when it is done receiving a message in shared memory */ 
    84 int sipc_shm_recv_done(sipc_t * sipc); 
     84int sipc_shm_recv_done(sipc_t *sipc); 
    8585 
    8686#endif 

  • trunk/libsipc/src/shm_internal.c

    r35 r36  
    3131 
    3232/* Receive NOP messages, which will unblock the sender */ 
    33 int sipc_shm_recv_done(sipc_t * sipc) 
     33int sipc_shm_recv_done(sipc_t *sipc) 
    3434{ 
    3535        if (!sipc) 

  • trunk/libsipc/src/sipc.c

    r35 r36  
    2929#include "sipc_internal.h" 
    3030 
    31 int (*sipc_init_f[SIPC_NUM_TYPES]) (sipc_t * sipc) = { 
     31int (*sipc_init_f[SIPC_NUM_TYPES]) (sipc_t *sipc) = { 
    3232sipc_shm_init, sipc_mqueue_init,}; 
    3333 
    …… 
    8484} 
    8585 
    86 void sipc_close(sipc_t * sipc) 
     86void sipc_close(sipc_t *sipc) 
    8787{ 
    8888        if (!sipc) 
    …… 
    116116} 
    117117 
    118 char *sipc_get_data_ptr(sipc_t * sipc) 
     118char *sipc_get_data_ptr(sipc_t *sipc) 
    119119{ 
    120120        if (!sipc) 
    …… 
    124124} 
    125125 
    126 int sipc_send_data(sipc_t * sipc, int msg_len) 
     126int sipc_send_data(sipc_t *sipc, int msg_len) 
    127127{ 
    128128        if (!sipc) 
    …… 
    132132} 
    133133 
    134 int sipc_recv_data(sipc_t * sipc, char **data, int *len) 
     134int sipc_recv_data(sipc_t *sipc, char **data, int *len) 
    135135{ 
    136136        if (!sipc) 
    …… 
    140140} 
    141141 
    142 void sipc_error(sipc_t * sipc, const char *fmt, ...) 
     142void sipc_error(sipc_t *sipc, const char *fmt, ...) 
    143143{ 
    144144        if (!sipc) 

  • trunk/libsipc/src/sipc_internal.h

    r35 r36  
    3838 
    3939/* Creation functions */ 
    40 int sipc_mqueue_create(sipc_t * sipc); 
    41 int sipc_shm_create(sipc_t * sipc); 
     40int sipc_mqueue_create(sipc_t *sipc); 
     41int sipc_shm_create(sipc_t *sipc); 
    4242int mqueue_create(key_t key); 
    4343 
    4444/* Attach functions */ 
    45 int sipc_mqueue_attach(sipc_t * sipc); 
    46 int sipc_shm_attach(sipc_t * sipc); 
     45int sipc_mqueue_attach(sipc_t *sipc); 
     46int sipc_shm_attach(sipc_t *sipc); 
    4747 
    4848/* Detach functions */ 
    49 void sipc_mqueue_detach(sipc_t * sipc); 
    50 void sipc_shm_detach(sipc_t * sipc); 
     49void sipc_mqueue_detach(sipc_t *sipc); 
     50void sipc_shm_detach(sipc_t *sipc); 
    5151 
    5252/* Destruction functions */ 
    …… 
    5555 
    5656/* Initialization functions */ 
    57 int sipc_mqueue_init(sipc_t * sipc); 
    58 int sipc_shm_init(sipc_t * sipc); 
     57int sipc_mqueue_init(sipc_t *sipc); 
     58int sipc_shm_init(sipc_t *sipc); 
    5959 
    6060/* all ipc backends must implement all of these functions */ 
    6161struct sipc_func_table 
    6262{ 
    63         int (*sipc_create) (sipc_t * sipc); 
    64         int (*sipc_attach) (sipc_t * sipc); 
    65         char *(*sipc_get_data_ptr) (sipc_t * sipc); 
    66         int (*sipc_send_data) (sipc_t * sipc, int msg_len); 
    67         int (*sipc_recv_data) (sipc_t * sipc, char **data, int *len); 
    68         void (*sipc_detach) (sipc_t * sipc); 
     63        int (*sipc_create) (sipc_t *sipc); 
     64        int (*sipc_attach) (sipc_t *sipc); 
     65        char *(*sipc_get_data_ptr) (sipc_t *sipc); 
     66        int (*sipc_send_data) (sipc_t *sipc, int msg_len); 
     67        int (*sipc_recv_data) (sipc_t *sipc, char **data, int *len); 
     68        void (*sipc_detach) (sipc_t *sipc); 
    6969        void (*_sipc_error) (const char *fmt, va_list ap); 
    7070}; 

  • trunk/libsipc/src/sipc_mqueue.c

    r35 r36  
    5050 
    5151/* Forward decls */ 
    52 static int get_max_msg(sipc_t * sipc); 
    53 static int mqueue_send_msg_len(sipc_t * sipc, int msg_len); 
    54 static int mqueue_send_end_xmit(sipc_t * sipc); 
    55 static char *split_data(sipc_t * sipc, size_t packet_sz); 
     52static int get_max_msg(sipc_t *sipc); 
     53static int mqueue_send_msg_len(sipc_t *sipc, int msg_len); 
     54static int mqueue_send_end_xmit(sipc_t *sipc); 
     55static char *split_data(sipc_t *sipc, size_t packet_sz); 
    5656static int is_msg_len(struct msgbuf *mbuf); 
    5757static int is_end_xmit(struct msgbuf *mbuf); 
    58 static int msg_done(sipc_t * sipc); 
     58static int msg_done(sipc_t *sipc); 
    5959static size_t next_packet_sz(int recv, int max_packet_sz, int msg_len); 
    6060static size_t next_alloc_sz(int recv, int recv_sz, int max_packet_sz, int msg_len); 
    6161 
    62 int sipc_mqueue_init(sipc_t * sipc) 
     62int sipc_mqueue_init(sipc_t *sipc) 
    6363{ 
    6464        if (!sipc) 
    …… 
    7979 * This function should only be called by a helper application 
    8080 * and not by the sender or reciever. */ 
    81 int sipc_mqueue_create(sipc_t * sipc) 
     81int sipc_mqueue_create(sipc_t *sipc) 
    8282{ 
    8383        int msqid; 
    …… 
    9393} 
    9494 
    95 void sipc_mqueue_detach(sipc_t * sipc) 
     95void sipc_mqueue_detach(sipc_t *sipc) 
    9696{ 
    9797        free(sipc->data); 
    …… 
    100100 
    101101/* Attach to an existing message queue. */ 
    102 int sipc_mqueue_attach(sipc_t * sipc) 
     102int sipc_mqueue_attach(sipc_t *sipc) 
    103103{ 
    104104        /* Allocate data member */ 
    …… 
    120120} 
    121121 
    122 char *sipc_mqueue_get_data_ptr(sipc_t * sipc) 
     122char *sipc_mqueue_get_data_ptr(sipc_t *sipc) 
    123123{ 
    124124        return sipc->data; 
    …… 
    127127/* Sends a message to the queue. 
    128128 * Returns 0 on success, -1 on error */ 
    129 int sipc_mqueue_send_data(sipc_t * sipc, int msg_len) 
     129int sipc_mqueue_send_data(sipc_t *sipc, int msg_len) 
    130130{ 
    131131        int max_packet_sz = SIPC_MQUEUE_MSG_SZ - sizeof(struct msgbuf); 
    …… 
    180180} 
    181181 
    182 int sipc_mqueue_recv_data(sipc_t * sipc, char **data, int *len) 
     182int sipc_mqueue_recv_data(sipc_t *sipc, char **data, int *len) 
    183183{ 
    184184        int retv = -1, alloc_sz = 0, idx = 0, recv_sz; 
    …… 
    283283/* Gets the maximum allowed size of a message in a message queue. 
    284284 * Returns the maximum allowed size of a message, -1 on error */ 
    285 static int get_max_msg(sipc_t * sipc) 
     285static int get_max_msg(sipc_t *sipc) 
    286286{ 
    287287        FILE *f; 
    …… 
    304304 
    305305/* Send end of transmission marker */ 
    306 static int mqueue_send_end_xmit(sipc_t * sipc) 
     306static int mqueue_send_end_xmit(sipc_t *sipc) 
    307307{ 
    308308        struct msgbuf mbuf; 
    …… 
    329329} 
    330330 
    331 static int mqueue_send_msg_len(sipc_t * sipc, int len) 
     331static int mqueue_send_msg_len(sipc_t *sipc, int len) 
    332332{ 
    333333        struct msgbuf *mbuf; 
    …… 
    376376/* Returns 1 if the message has been completely fragmented, 
    377377 * 0 otherwise. */ 
    378 static int msg_done(sipc_t * sipc) 
     378static int msg_done(sipc_t *sipc) 
    379379{ 
    380380        return sipc->copied >= sipc->msg_len ? 1 : 0; 
    …… 
    385385 * This function allocates space for the fragmented piece of data. 
    386386 * The caller is responsible for freeign this memory. */ 
    387 static char *split_data(sipc_t * sipc, size_t packet_sz) 
     387static char *split_data(sipc_t *sipc, size_t packet_sz) 
    388388{ 
    389389        size_t remaining = sipc->msg_len - sipc->copied; 

  • trunk/libsipc/src/sipc_mqueue.h

    r35 r36  
    2828#define MQ_NOBLOCK 0 
    2929 
    30 int sipc_mqueue_init(sipc_t * sipc); 
    31 int sipc_mqueue_connect(sipc_t * sipc); 
    32 void sipc_mqueue_disconnect(sipc_t * sipc); 
    33 char *sipc_mqueue_get_data_ptr(sipc_t * sipc); 
    34 int sipc_mqueue_send_data(sipc_t * sipc, int msg_len); 
    35 int sipc_mqueue_recv_data(sipc_t * sipc, char **data, int *len); 
    36 int sipc_mqueue_end_xmit(sipc_t * sipc); 
    37 void sipc_mqueue_destroy_handle(sipc_t * sipc); 
     30int sipc_mqueue_init(sipc_t *sipc); 
     31int sipc_mqueue_connect(sipc_t *sipc); 
     32void sipc_mqueue_disconnect(sipc_t *sipc); 
     33char *sipc_mqueue_get_data_ptr(sipc_t *sipc); 
     34int sipc_mqueue_send_data(sipc_t *sipc, int msg_len); 
     35int sipc_mqueue_recv_data(sipc_t *sipc, char **data, int *len); 
     36int sipc_mqueue_end_xmit(sipc_t *sipc); 
     37void sipc_mqueue_destroy_handle(sipc_t *sipc); 
    3838void sipc_mqueue_error(const char *fmt, va_list ap); 
    3939 

  • trunk/libsipc/src/sipc_shm.c

    r35 r36  
    5050}; 
    5151 
    52 int sipc_shm_init(sipc_t * sipc) 
     52int sipc_shm_init(sipc_t *sipc) 
    5353{ 
    5454        if (!sipc) 
    …… 
    6161} 
    6262 
    63 int sipc_shm_create(sipc_t * sipc) 
     63int sipc_shm_create(sipc_t *sipc) 
    6464{ 
    6565        if (!sipc) 
    …… 
    9090} 
    9191 
    92 int sipc_shm_attach(sipc_t * sipc) 
     92int sipc_shm_attach(sipc_t *sipc) 
    9393{ 
    9494        int flags = 0; 
    …… 
    125125} 
    126126 
    127 void sipc_shm_detach(sipc_t * sipc) 
     127void sipc_shm_detach(sipc_t *sipc) 
    128128{ 
    129129        if (!sipc) 
    …… 
    146146} 
    147147 
    148 char *sipc_shm_get_data_ptr(sipc_t * sipc) 
     148char *sipc_shm_get_data_ptr(sipc_t *sipc) 
    149149{ 
    150150        return sipc->data; 
    …… 
    152152 
    153153/* Sends a DATA_READY marker, followed by 2 NOP markers */ 
    154 int sipc_shm_send_data(sipc_t * sipc, int msg_len) 
     154int sipc_shm_send_data(sipc_t *sipc, int msg_len) 
    155155{ 
    156156        if (!sipc) 
    …… 
    182182 * This function will block if the DATA_READY marker is not 
    183183 * present on the queue. */ 
    184 int sipc_shm_recv_data(sipc_t * sipc, char **data, int *len) 
     184int sipc_shm_recv_data(sipc_t *sipc, char **data, int *len) 
    185185{ 
    186186        int mtype = 0; 

  • trunk/libsipc/src/sipc_shm.h

    r35 r36  
    2525#include <stdarg.h> 
    2626 
    27 int sipc_shm_init(sipc_t * sipc); 
    28 int sipc_shm_connect(sipc_t * sipc); 
    29 void sipc_shm_disconnect(sipc_t * sipc); 
    30 char *sipc_shm_get_data_ptr(sipc_t * sipc); 
    31 int sipc_shm_send_data(sipc_t * sipc, int msg_len); 
    32 int sipc_shm_recv_data(sipc_t * sipc, char **data, int *len); 
    33 int sipc_shm_end_xmit(sipc_t * sipc); 
    34 void sipc_shm_destroy_handle(sipc_t * sipc); 
     27int sipc_shm_init(sipc_t *sipc); 
     28int sipc_shm_connect(sipc_t *sipc); 
     29void sipc_shm_disconnect(sipc_t *sipc); 
     30char *sipc_shm_get_data_ptr(sipc_t *sipc); 
     31int sipc_shm_send_data(sipc_t *sipc, int msg_len); 
     32int sipc_shm_recv_data(sipc_t *sipc, char **data, int *len); 
     33int sipc_shm_end_xmit(sipc_t *sipc); 
     34void sipc_shm_destroy_handle(sipc_t *sipc); 
    3535void sipc_shm_error(const char *fmt, va_list ap); 
    3636 

  • trunk/libsipc/tests/mqueue.c

    r35 r36  
    4141static sipc_t *writer_ipc; 
    4242static sipc_t *reader_ipc; 
    43 static int send_end_xmit(sipc_t * ipc); 
     43static int send_end_xmit(sipc_t *ipc); 
    4444static void do_parent(void); 
    4545static void do_child(void); 
    …… 
    219219} 
    220220 
    221 static int send_end_xmit(sipc_t * ipc) 
     221static int send_end_xmit(sipc_t *ipc) 
    222222{ 
    223223        char *data = sipc_get_data_ptr(ipc); 

  • trunk/libsipc/tests/shm.c

    r35 r36  
    4646static void do_binary_child(void); 
    4747static void do_binary_parent(void); 
    48 static void send_end_xmit(sipc_t * sipc); 
     48static void send_end_xmit(sipc_t *sipc); 
    4949static int verify_data(char *filename, char *recv_data); 
    5050static inline int END_XMIT(char *data); 
    …… 
    324324} 
    325325 
    326 static void send_end_xmit(sipc_t * sipc) 
     326static void send_end_xmit(sipc_t *sipc) 
    327327{ 
    328328        char *data = sipc_get_data_ptr(sipc);