Changeset 5538

Timestamp:

05/28/08 13:49:25 (4 months ago)

Author:

morris

Message:

Make messages, fields, types and parameters external types and provide API to introspect them

Files:

• libwired/trunk/libwired/p7/wi-p7-message.c (modified) (42 diffs)
• libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (4 diffs)
• libwired/trunk/libwired/p7/wi-p7-socket.h (modified) (2 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (60 diffs)
• libwired/trunk/libwired/p7/wi-p7-spec.h (modified) (3 diffs)

libwired/trunk/libwired/p7/wi-p7-message.c

@@ -55 +55 @@
-static wi_string_t *                                                            _wi_p7_message_description(wi_runtime_instance_t *);
-
-string_t *, wi_p7_type_t
+p7_spec_field_t *
-static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_reading_for_id(wi_p7_message_t *, uint32_t, unsigned char **, uint32_t *);
-static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_reading_for_name(wi_p7_message_t *, wi_string_t *, unsigned char **, uint32_t *);
-static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_writing_for_id(wi_p7_message_t *, uint32_t, uint32_t, unsigned char **);
-static wi_boolean_t                                                                     _wi_p7_message_get_binary_buffer_for_writing_for_name(wi_p7_message_t *, wi_string_t *, uint32_t, unsigned char **, uint32_t *);
-p7_type_t, wi_string_t *, wi_string
+string_t *, wi_string_t *, wi_p7_spec_type
-static xmlNodePtr                                                                       _wi_p7_message_xml_node_for_name(wi_p7_message_t *, const char *);
-static wi_string_t *                                                            _wi_p7_message_xml_copy_value_for_name(wi_p7_message_t *, wi_string_t *);
-type_t            
+spec_type_t *
-
-
@@ -203 +203 @@
-
-static wi_string_t * _wi_p7_message_description(wi_runtime_instance_t *instance) {
-
-
-
-
-
-
-
+
+
+
+
+
+
-        
-        description = wi_string_init_with_format(wi_string_alloc(), WI_STR("<%@ %p>{name = %@, serialization = %@"),
@@ -238 +237 @@
-                        buffer += sizeof(field_id);
-
-
+
+
-                        
-                        if(field_size == 0) {
@@ -246 +246 @@
-                        }
-                        
-
-
-
+
+
-
-                        wi_string_append_format(description, WI_STR("    %@ = %@\n"),
@@ -260 +259 @@
-                                if(node->type == XML_ELEMENT_NODE) {
-                                        field_name              = wi_autorelease(wi_p7_xml_copy_string_for_attribute(node, WI_STR("name")));
-
-
-
+
+
-                                        
-                                        wi_string_append_format(description, WI_STR("    %@ = %@\n"),
@@ -442 +440 @@
-#pragma mark -
-
-string_t *field_name, wi_p7_type_t type_i
-
+p7_spec_field_t *fiel
+name, *field_
-        wi_uuid_t                               *uuid;
-        wi_date_t                               *date;
@@ -458 +456 @@
-        wi_array_t                              *list;
-        
-
+
+
+
-                case WI_P7_BOOL:
-                        if(wi_p7_message_get_bool_for_name(p7_message, &p7_bool, field_name))
@@ -466 +466 @@
-                case WI_P7_ENUM:
-                        if(wi_p7_message_get_enum_for_name(p7_message, &p7_enum, field_name))
-p7_spec_enum_name(p7_message->spec, wi_p7_spec_field_id(p7_message->spec, field_name),
+hash_data_for_key(wi_p7_spec_field_enums_by_value(field), (void *)
-                        break;
-                        
@@ -541 +541 @@
-
-static wi_boolean_t _wi_p7_message_get_binary_buffer_for_reading_for_id(wi_p7_message_t *p7_message, uint32_t in_field_id, unsigned char **out_buffer, uint32_t *out_field_size) {
-
-
+
+
+
-        
-        message_size = p7_message->binary_size - WI_P7_MESSAGE_BINARY_HEADER_SIZE;
@@ -552 +553 @@
-                buffer += sizeof(field_id);
-
-
-
+
+
+
-                if(field_size == 0) {
-                        field_size = wi_read_swap_big_to_host_int32(buffer, 0);
@@ -579 +581 @@
-
-static wi_boolean_t _wi_p7_message_get_binary_buffer_for_reading_for_name(wi_p7_message_t *p7_message, wi_string_t *field_name, unsigned char **out_buffer, uint32_t *out_field_size) {
-
-
-
-
-
+
+
+
+
+
+
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_UNKNOWNFIELD,
-                        WI_STR("No id found for field \"%@\""), field_name);
@@ -593 +596 @@
-        }
-        
+        field_id = wi_p7_spec_field_id(field);
+
-        return _wi_p7_message_get_binary_buffer_for_reading_for_id(p7_message, field_id, out_buffer, out_field_size);
-}
@@ -599 +604 @@
-
-static wi_boolean_t _wi_p7_message_get_binary_buffer_for_writing_for_id(wi_p7_message_t *p7_message, uint32_t field_id, uint32_t length, unsigned char **out_buffer) {
-
-
-
-
+
+
+
+
+
+
-        
-        if(field_size == 0) {
@@ -630 +637 @@
-
-static wi_boolean_t _wi_p7_message_get_binary_buffer_for_writing_for_name(wi_p7_message_t *p7_message, wi_string_t *field_name, uint32_t length, unsigned char **out_buffer, uint32_t *out_field_id) {
-
-
-
-
-
+
+
+
+
+
+
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_UNKNOWNFIELD,
-                        WI_STR("No id found for field \"%@\""), field_name);
@@ -644 +652 @@
-        }
-        
+        field_id = wi_p7_spec_field_id(field);
+        
-        if(out_field_id)
-                *out_field_id = field_id;
@@ -652 +662 @@
-
-
-p7_type_t type_id, wi_string_t *field_name, wi_string_t *field_valu
+string_t *field_name, wi_string_t *field_value, wi_p7_spec_type_t *typ
-        xmlNodePtr              node;
-        
@@ -660 +670 @@
-                node = xmlNewNode(p7_message->xml_ns, (xmlChar *) "field");
-                xmlSetProp(node, (xmlChar *) "name", (xmlChar *) wi_string_cstring(field_name));
-p7_message->spec, type_id
+type
-                xmlAddChild(p7_message->xml_root_node, node);
-        }
@@ -713 +723 @@
-
-
-type_t
-xmlNodePtr             nod
-Char                        *prop
-wi_p7_type_t   type = WI_P7_SPEC_TYPE_ID_NULL
+spec_type_t *
+wi_p7_spec_type_t      *typ
+NodePtr                     node
+xmlChar                                *prop
-        
-        node = _wi_p7_message_xml_node_for_name(p7_message, wi_string_cstring(field_name));
-        
-        if(!node)
-WI_P7_SPEC_TYPE_ID_
+
-        
-        prop = xmlGetProp(node, (xmlChar *) "type");
-        
-        if(prop) {
-id
+with_name
-                
-                xmlFree(prop);
@@ -733 +743 @@
-        }
-        
-WI_P7_SPEC_TYPE_ID_
+
-}
-
@@ -742 +752 @@
-void wi_p7_message_serialize(wi_p7_message_t *p7_message, wi_p7_serialization_t serialization) {
-        xmlNodePtr                              listnode, itemnode;
+        wi_p7_spec_field_t              *field;
+        wi_p7_spec_type_t               *type, *listtype;
-        wi_runtime_instance_t   *instance;
-        wi_string_t                             *field_name, *field_value;
@@ -757 +769 @@
-        wi_data_t                               *data;
-        wi_array_t                              *list;
-        wi_p7_type_t                    type_id, listtype_id;
-        wi_uinteger_t                   i, count;
-        uint32_t                                message_size, field_id, field_size;
@@ -785 +796 @@
-                        
-                        while((uint32_t) (buffer - start) < message_size) {
- 
- 
-
- = wi_p7_spec_field_size(p7_message->spec, field_i
+               
+                 
+field                  = wi_p7_spec_field_with_id(p7_message->spec, field_id);
+             = wi_p7_spec_field_size(fiel
-                                
-                                if(field_size == 0) {
@@ -796 +807 @@
-                                }
-                                
-
-
+
-                                field_value             = NULL;
-
-
+
+
+
-                                        case WI_P7_BOOL:
-                                                if(wi_p7_message_get_bool_for_name(p7_message, &p7_bool, field_name))
@@ -878 +889 @@
-                                                        
-                                                        if(!listnode) {
-_id = wi_p7_spec_field_listtype(p7_message->spec, wi_p7_spec_field_id(p7_message->spec, field_name)
+ = wi_p7_spec_field_listtype(field
-                                                                listnode = xmlNewNode(p7_message->xml_ns, (xmlChar *) "field");
-                                                                xmlSetProp(listnode, (xmlChar *) "name", (xmlChar *) wi_string_cstring(field_name));
-p7_message->spec, type_id
-p7_message->spec, listtype_id
+type
+listtype
-                                                                xmlAddChild(p7_message->xml_root_node, listnode);
-                                                        }
@@ -902 +913 @@
-                                
-                                if(field_value)
-type_id, field_name, field_valu
+field_name, field_value, typ
-                                
-                                buffer += field_size;
@@ -917 +928 @@
-
-void wi_p7_message_deserialize(wi_p7_message_t *p7_message) {
+        wi_p7_spec_message_t            *message;
+        
-        if(p7_message->serialization == WI_P7_BINARY) {
-                p7_message->binary_id = wi_read_swap_big_to_host_int32(p7_message->binary_buffer, 0);
-
+
+
+
+
+
-        } else {
-                p7_message->xml_doc = xmlParseDoc((xmlChar *) wi_string_cstring(p7_message->xml_string));
@@ -937 +954 @@
-
-wi_boolean_t wi_p7_message_set_name(wi_p7_message_t *p7_message, wi_string_t *name) {
+        wi_p7_spec_message_t            *message;
+        
-        if(p7_message->serialization == WI_P7_BINARY) {
-p7_message->binary_id = wi_p7_spec_message_id
-
-p7_message->binary_id == WI_P7_SPEC_MESSAGE_ID_NULL
+message = wi_p7_spec_message_with_name
+
+!message
-                        wi_error_set_libwired_p7_error(WI_ERROR_P7_UNKNOWNMESSAGE,
-                                WI_STR("No id found for message \"%@\""), name);
@@ -950 +969 @@
-                }
-                
+                p7_message->binary_id = wi_p7_spec_message_id(message);
+                
-                wi_write_swap_host_to_big_int32(p7_message->binary_buffer, 0, p7_message->binary_id);
-        }
@@ -978 +999 @@
-
-wi_hash_t * wi_p7_message_fields(wi_p7_message_t *p7_message) {
-hash_t                      *fields
-string_t                    *field_name, *type_name, *field_value
-xmlNodePtr                     nod
-unsigned char          *buffer, *start
-wi_p7_type_t           type_id
-
+p7_spec_field_t             *field
+hash_t                              *fields
+wi_string_t                            *field_name, *field_valu
+xmlNodePtr                             node
+unsigned char                  *buffer, *start
+       
-        
-        fields = wi_hash_init(wi_hash_alloc());
@@ -992 +1013 @@
-                
-                while((uint32_t) (buffer - start) < message_size) {
- 
- 
-
- = wi_p7_spec_field_size(p7_message->spec, field_i
+       
+         
+
+     = wi_p7_spec_field_size(fiel
-                        
-                        if(field_size == 0) {
@@ -1003 +1024 @@
-                        }
-                        
-
-
-
+
+
-
-                        wi_hash_set_data_for_key(fields, field_value, field_name);
@@ -1016 +1036 @@
-                                if(node->type == XML_ELEMENT_NODE) {
-                                        field_name              = wi_autorelease(wi_p7_xml_copy_string_for_attribute(node, WI_STR("name")));
-
-
-
+
+
-                                        
-                                        wi_hash_set_data_for_key(fields, field_value, field_name);
@@ -1473 +1492 @@
-
-wi_number_t * wi_p7_message_number_for_name(wi_p7_message_t *p7_message, wi_string_t *field_name) {
+        wi_p7_spec_field_t              *field;
+        wi_p7_spec_type_t               *type;
-        wi_p7_boolean_t                 p7_bool;
-        wi_p7_int32_t                   p7_int32;
@@ -1479 +1500 @@
-        wi_p7_uint64_t                  p7_uint64;
-        wi_p7_double_t                  p7_double;
-        wi_p7_type_t                    type_id;
-        uint32_t                                field_id;
-        
-        if(p7_message->serialization == WI_P7_BINARY) {
-_id = wi_p7_spec_field_id
-
-field_id == WI_P7_SPEC_FIELD_ID_NULL
+ = wi_p7_spec_field_with_name
+
+!field
-                        return NULL;
-                
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                case WI_P7_BOOL:
-                        if(wi_p7_message_get_bool_for_name(p7_message, &p7_bool, field_name))
@@ -1534 +1556 @@
-
-wi_boolean_t wi_p7_message_set_enum_name_for_name(wi_p7_message_t *p7_message, wi_string_t *enum_name, wi_string_t *field_name) {
+        wi_p7_spec_field_t      *field;
+        wi_hash_t                       *enums;
-        wi_p7_enum_t            enum_value;
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        return wi_p7_message_set_enum_for_name(p7_message, enum_value, field_name);
@@ -1544 +1592 @@
-
-wi_string_t * wi_p7_message_enum_name_for_name(wi_p7_message_t *p7_message, wi_string_t *field_name) {
+        wi_p7_spec_field_t      *field;
+        wi_hash_t                       *enums;
-        wi_p7_enum_t            enum_value;
-        
@@ -1549 +1599 @@
-                return NULL;
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1703 +1766 @@
-        xmlNodePtr                              listnode, itemnode;
-        xmlChar                                 *content;
+        wi_p7_spec_field_t              *field;
+        wi_p7_spec_type_t               *listtype;
-        wi_array_t                              *list;
-        wi_runtime_instance_t   *instance;
-        unsigned char                   *binary;
-
+_id
-        uint32_t                                field_size, list_size, string_size;
-        
-listtype = wi_p7_spec_field_listtype(p7_message->spec, wi_p7_spec_field_id(p7_message->spec, field_name)
-
-listtype != WI_P7_STRING
+field = wi_p7_spec_field_with_name(p7_message->spec, field_name
+
+!field
-                wi_error_set_libwired_p7_error(WI_ERROR_P7_UNKNOWNFIELD,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                if(wi_p7_message_debug)
@@ -1730 +1808 @@
-                
-                while(list_size < field_size) {
-
+_id
-                                string_size = wi_read_swap_big_to_host_int32(binary, list_size);
-                                
@@ -1752 +1830 @@
-                                        continue;
-                                
-
+_id
-                                        instance = wi_string_with_cstring_no_copy((char *) content, true);
-                                
@@ -1768 +1846 @@
-
-wi_boolean_t wi_p7_message_write_binary(wi_p7_message_t *p7_message, const void *buffer, uint32_t field_size, wi_uinteger_t field_id) {
-
+
+
-        
-        if(p7_message->serialization != WI_P7_BINARY)
@@ -1777 +1856 @@
-
-        wi_write_swap_host_to_big_int32(binary, 0, field_id);
-
-
+
+
+
+
-                memcpy(binary + 4, buffer, field_size);
-        } else {

libwired/trunk/libwired/p7/wi-p7-socket.c

@@ -166 +166 @@
-        wi_uinteger_t                                                   oobdata_read_buffer_length;
-        
+        wi_p7_socket_message_callback_func_t    *read_message_callback;
+        void                                                                    *read_message_context;
+        
+        wi_p7_socket_message_callback_func_t    *wrote_message_callback;
+        void                                                                    *wrote_message_context;
+        
-        uint64_t                                                                read_raw_bytes, read_processed_bytes;
-        uint64_t                                                                sent_raw_bytes, sent_processed_bytes;
@@ -342 +348 @@
-
-
+void wi_p7_socket_set_read_message_callback(wi_p7_socket_t *p7_socket, wi_p7_socket_message_callback_func_t *callback, void *context) {
+        p7_socket->read_message_callback = callback;
+        p7_socket->read_message_context = context;
+}
+
+
+
+void wi_p7_socket_set_wrote_message_callback(wi_p7_socket_t *p7_socket, wi_p7_socket_message_callback_func_t *callback, void *context) {
+        p7_socket->wrote_message_callback = callback;
+        p7_socket->wrote_message_context = context;
+}
+
+
+
-#pragma mark -
-
@@ -1549 +1569 @@
-                        ((double) p7_socket->sent_processed_bytes / (double) p7_socket->sent_raw_bytes) * 100.0);
-        }
+        
+        if(p7_socket->wrote_message_callback)
+                (*p7_socket->wrote_message_callback)(p7_socket, p7_message, p7_socket->wrote_message_context);
-        
-        return true;
@@ -1610 +1633 @@
-        }
-
+        if(p7_socket->read_message_callback)
+                (*p7_socket->read_message_callback)(p7_socket, p7_message, p7_socket->read_message_context);
+
-        return p7_message;
-}

libwired/trunk/libwired/p7/wi-p7-socket.h

@@ -73 +73 @@
-typedef enum _wi_p7_options                                                     wi_p7_options_t;
-
+typedef void                                                                            wi_p7_socket_message_callback_func_t(wi_p7_socket_t *, wi_p7_message_t *, void *);
+
-
-typedef wi_string_t *                                                           wi_p7_socket_password_provider_func_t(wi_string_t *);
@@ -88 +90 @@
-WI_EXPORT void                                                                          wi_p7_socket_set_tls(wi_p7_socket_t *, wi_socket_tls_t *);
-WI_EXPORT wi_socket_tls_t *                                                     wi_p7_socket_tls(wi_p7_socket_t *);
+WI_EXPORT void                                                                          wi_p7_socket_set_read_message_callback(wi_p7_socket_t *, wi_p7_socket_message_callback_func_t *, void *);
+WI_EXPORT void                                                                          wi_p7_socket_set_wrote_message_callback(wi_p7_socket_t *, wi_p7_socket_message_callback_func_t *, void *);
-
-WI_EXPORT wi_socket_t *                                                         wi_p7_socket_socket(wi_p7_socket_t *);

libwired/trunk/libwired/p7/wi-p7-spec.c

@@ -52 +52 @@
-#include <wired/wi-string.h>
-
-typedef struct _wi_p7_spec_type                         _wi_p7_spec_type_t;
-typedef struct _wi_p7_spec_field                        _wi_p7_spec_field_t;
-typedef struct _wi_p7_spec_collection           _wi_p7_spec_collection_t;
-typedef struct _wi_p7_spec_message                      _wi_p7_spec_message_t;
-typedef struct _wi_p7_spec_parameter            _wi_p7_spec_parameter_t;
-typedef struct _wi_p7_spec_transaction          _wi_p7_spec_transaction_t;
-typedef struct _wi_p7_spec_broadcast            _wi_p7_spec_broadcast_t;
@@ -71 +67 @@
-};
-
-_
+
-static void                                                                     _wi_p7_spec_type_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                                            _wi_p7_spec_type_description(wi_runtime_instance_t *);
@@ -77 +73 @@
-static wi_runtime_id_t                                          _wi_p7_spec_type_runtime_id = WI_RUNTIME_ID_NULL;
-static wi_runtime_class_t                                       _wi_p7_spec_type_runtime_class = {
-_
+
-    _wi_p7_spec_type_dealloc,
-    NULL,
@@ -92 +88 @@
-        wi_string_t                                                             *name;
-        wi_uinteger_t                                                   id;
-_
-_
+
+
-        wi_hash_t                                                               *enums_name;
-id
+value
-};
-
-_wi_p7_spec_field_t *
+wi_p7_spec_field_t *    
-static void                                                                     _wi_p7_spec_field_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                                            _wi_p7_spec_field_description(wi_runtime_instance_t *);
@@ -104 +100 @@
-static wi_runtime_id_t                                          _wi_p7_spec_field_runtime_id = WI_RUNTIME_ID_NULL;
-static wi_runtime_class_t                                       _wi_p7_spec_field_runtime_class = {
-_
+
-    _wi_p7_spec_field_dealloc,
-    NULL,
@@ -148 +144 @@
-};
-
-_
+
-static void                                                                     _wi_p7_spec_message_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                                            _wi_p7_spec_message_description(wi_runtime_instance_t *);
@@ -154 +150 @@
-static wi_runtime_id_t                                          _wi_p7_spec_message_runtime_id = WI_RUNTIME_ID_NULL;
-static wi_runtime_class_t                                       _wi_p7_spec_message_runtime_class = {
-_
+
-    _wi_p7_spec_message_dealloc,
-    NULL,
@@ -167 +163 @@
-        wi_runtime_base_t                                               base;
-        
-_
+
-        wi_boolean_t                                                    required;
-};
-
-_wi_p7_spec_parameter_t *                       _wi_p7_spec_parameter_with_node(wi_p7_spec_t *, xmlNodePtr, _
-_wi_p7_spec_parameter_t *          &n