mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-06 01:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

btstack_linked_list: remove user data field

Browse Source
This commit is contained in:
Matthias Ringwald 2016-02-01 23:06:54 +01:00
parent 91a977e85b
commit c4786d381e
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platform/daemon/socket_connection.c
View File

@ -110,9 +110,14 @@ typedef enum {
SOCKET_W4_DATA SOCKET_W4_DATA
} SOCKET_STATE; } SOCKET_STATE;
typedef struct linked_connection {
btstack_linked_item_t item;
connection_t * connection;
} linked_connection_t;
struct connection { struct connection {
btstack_data_source_t ds; // used for run loop btstack_data_source_t ds; // used for run loop
btstack_linked_item_t item; // used for connection list, user_data points to connection_t base linked_connection_t linked_connection; // used for connection list
SOCKET_STATE state; SOCKET_STATE state;
uint16_t bytes_read; uint16_t bytes_read;
uint16_t bytes_to_read; uint16_t bytes_to_read;
@ -144,7 +149,7 @@ void socket_connection_free_connection(connection_t *conn){
btstack_run_loop_remove_data_source(&conn->ds); btstack_run_loop_remove_data_source(&conn->ds);
// and from connection list // and from connection list
btstack_linked_list_remove(&connections, &conn->item); btstack_linked_list_remove(&connections, &conn->linked_connection.item);
// destroy // destroy
free(conn); free(conn);
@ -161,7 +166,10 @@ connection_t * socket_connection_register_new_connection(int fd){
// create connection objec // create connection objec
connection_t * conn = malloc( sizeof(connection_t)); connection_t * conn = malloc( sizeof(connection_t));
if (conn == NULL) return 0; if (conn == NULL) return 0;
btstack_linked_item_set_user( &conn->item, conn);
// store reference from linked item to base object
conn->linked_connection.connection = conn;
conn->ds.fd = fd; conn->ds.fd = fd;
conn->ds.process = socket_connection_hci_process; conn->ds.process = socket_connection_hci_process;
@ -172,7 +180,7 @@ connection_t * socket_connection_register_new_connection(int fd){
btstack_run_loop_add_data_source( &conn->ds ); btstack_run_loop_add_data_source( &conn->ds );
// and the connection list // and the connection list
btstack_linked_list_add( &connections, &conn->item); btstack_linked_list_add( &connections, &conn->linked_connection.item);
return conn; return conn;
} }
@ -210,7 +218,7 @@ int socket_connection_hci_process(struct btstack_data_source *ds) {
socket_connection_emit_connection_closed(conn); socket_connection_emit_connection_closed(conn);
// free connection // free connection
socket_connection_free_connection(btstack_linked_item_get_user(&conn->item)); socket_connection_free_connection(conn);
socket_connection_emit_nr_connections(); socket_connection_emit_nr_connections();
return 0; return 0;
@ -538,7 +546,8 @@ void socket_connection_send_packet_all(uint16_t type, uint16_t channel, uint8_t
btstack_linked_item_t *it; btstack_linked_item_t *it;
for (it = (btstack_linked_item_t *) connections; it ; it = next){ for (it = (btstack_linked_item_t *) connections; it ; it = next){
next = it->next; // cache pointer to next connection_t to allow for removal next = it->next; // cache pointer to next connection_t to allow for removal
socket_connection_send_packet( (connection_t *) btstack_linked_item_get_user(it), type, channel, packet, size); linked_connection_t * linked_connection = (linked_connection_t *) it;
socket_connection_send_packet( linked_connection->connection, type, channel, packet, size);
} }
} }

10
src/btstack_linked_list.c
View File

@ -124,16 +124,6 @@ int btstack_linked_list_remove(btstack_linked_list_t * list, btstack_linked_ite
return counter; return counter;
} }
void btstack_linked_item_set_user(btstack_linked_item_t *item, void *user_data){
item->next = (btstack_linked_item_t *) 0;
item->user_data = user_data;
}
void * btstack_linked_item_get_user(btstack_linked_item_t *item) {
return item->user_data;
}
// //
// Linked List Iterator implementation // Linked List Iterator implementation
// //

4
src/btstack_linked_list.h
View File

@ -60,10 +60,6 @@ typedef struct {
} btstack_linked_list_iterator_t; } btstack_linked_list_iterator_t;
// set user data
void btstack_linked_item_set_user(btstack_linked_item_t *item, void *user_data);
// get user data
void * btstack_linked_item_get_user(btstack_linked_item_t *item);
// test if list is empty // test if list is empty
int btstack_linked_list_empty(btstack_linked_list_t * list); int btstack_linked_list_empty(btstack_linked_list_t * list);
// add item to list as first element // add item to list as first element