server/red_channel: renames to use _proc postfix consistently

rename types - we use _proc suffix mostly to indicate function pointer types,
use it for some function pointers that were missing it.

s/channel_handle_migrate_flush_mark/channel_handle_migrate_flush_mark_proc/
s/channel_handle_migrate_data_get_serial/channel_handle_migrate_data_get_serial_proc/
s/channel_handle_migrate_data/channel_handle_migrate_data_proc/
This commit is contained in:
Alon Levy 2011-03-24 16:41:02 +02:00
parent 92bfb91917
commit 8fbc41b717
3 changed files with 21 additions and 21 deletions

View File

@ -329,9 +329,9 @@ RedChannel *red_channel_create(int size, RedsStream *stream,
channel_hold_pipe_item_proc hold_item,
channel_send_pipe_item_proc send_item,
channel_release_pipe_item_proc release_item,
channel_handle_migrate_flush_mark handle_migrate_flush_mark,
channel_handle_migrate_data handle_migrate_data,
channel_handle_migrate_data_get_serial handle_migrate_data_get_serial)
channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark,
channel_handle_migrate_data_proc handle_migrate_data,
channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial)
{
RedChannel *channel;
@ -423,9 +423,9 @@ RedChannel *red_channel_create_parser(int size, RedsStream *stream,
channel_release_pipe_item_proc release_item,
channel_on_incoming_error_proc incoming_error,
channel_on_outgoing_error_proc outgoing_error,
channel_handle_migrate_flush_mark handle_migrate_flush_mark,
channel_handle_migrate_data handle_migrate_data,
channel_handle_migrate_data_get_serial handle_migrate_data_get_serial)
channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark,
channel_handle_migrate_data_proc handle_migrate_data,
channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial)
{
RedChannel *channel = red_channel_create(size, stream,
core, migrate, handle_acks, config_socket, do_nothing_disconnect,

View File

@ -131,10 +131,10 @@ typedef void (*channel_release_pipe_item_proc)(RedChannel *channel,
typedef void (*channel_on_incoming_error_proc)(RedChannel *channel);
typedef void (*channel_on_outgoing_error_proc)(RedChannel *channel);
typedef int (*channel_handle_migrate_flush_mark)(RedChannel *channel);
typedef uint64_t (*channel_handle_migrate_data)(RedChannel *channel,
typedef int (*channel_handle_migrate_flush_mark_proc)(RedChannel *channel);
typedef uint64_t (*channel_handle_migrate_data_proc)(RedChannel *channel,
uint32_t size, void *message);
typedef uint64_t (*channel_handle_migrate_data_get_serial)(RedChannel *channel,
typedef uint64_t (*channel_handle_migrate_data_get_serial_proc)(RedChannel *channel,
uint32_t size, void *message);
struct RedChannel {
@ -180,9 +180,9 @@ struct RedChannel {
channel_on_outgoing_error_proc on_outgoing_error;
int shut; /* signal channel is to be closed */
channel_handle_migrate_flush_mark handle_migrate_flush_mark;
channel_handle_migrate_data handle_migrate_data;
channel_handle_migrate_data_get_serial handle_migrate_data_get_serial;
channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark;
channel_handle_migrate_data_proc handle_migrate_data;
channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial;
#ifdef RED_STATISTICS
uint64_t *out_bytes_counter;
#endif
@ -201,9 +201,9 @@ RedChannel *red_channel_create(int size, RedsStream *stream,
channel_hold_pipe_item_proc hold_item,
channel_send_pipe_item_proc send_item,
channel_release_pipe_item_proc release_item,
channel_handle_migrate_flush_mark handle_migrate_flush_mark,
channel_handle_migrate_data handle_migrate_data,
channel_handle_migrate_data_get_serial handle_migrate_data_get_serial);
channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark,
channel_handle_migrate_data_proc handle_migrate_data,
channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial);
/* alternative constructor, meant for marshaller based (inputs,main) channels,
* will become default eventually */
@ -220,9 +220,9 @@ RedChannel *red_channel_create_parser(int size, RedsStream *stream,
channel_release_pipe_item_proc release_item,
channel_on_incoming_error_proc incoming_error,
channel_on_outgoing_error_proc outgoing_error,
channel_handle_migrate_flush_mark handle_migrate_flush_mark,
channel_handle_migrate_data handle_migrate_data,
channel_handle_migrate_data_get_serial handle_migrate_data_get_serial);
channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark,
channel_handle_migrate_data_proc handle_migrate_data,
channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial);
int red_channel_is_connected(RedChannel *channel);

View File

@ -8857,9 +8857,9 @@ static RedChannel *__new_channel(RedWorker *worker, int size, uint32_t channel_i
channel_hold_pipe_item_proc hold_item,
channel_release_pipe_item_proc release_item,
channel_handle_parsed_proc handle_parsed,
channel_handle_migrate_flush_mark handle_migrate_flush_mark,
channel_handle_migrate_data handle_migrate_data,
channel_handle_migrate_data_get_serial handle_migrate_data_get_serial)
channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark,
channel_handle_migrate_data_proc handle_migrate_data,
channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial)
{
struct epoll_event event;
RedChannel *channel;