Changeset 2089

Timestamp:

06/03/09 16:45:17 (15 months ago)

Author:

drobilla

Message:

Kludge around broken raptor_sequence_set_at.

Location:

trunk/slv2

Files:

• src/plugin.c (modified) (9 diffs)
• src/port.c (modified) (1 diff)
• src/slv2_internal.h (modified) (1 diff)
• test/slv2_test.c (modified) (1 diff)

trunk/slv2/src/plugin.c

@@ -49 +49 @@
         plugin->storage = NULL;
         plugin->rdf = NULL;
+        plugin->num_ports = 0;
 
         return plugin;
@@ -67 +68 @@
         p->binary_uri = NULL;
 
-        if (p->ports)
-                raptor_free_sequence(p->ports);
-        p->ports = NULL;
+        if (p->ports) {
+                for (uint32_t i = 0; i < p->num_ports; ++i)
+                        slv2_port_free(p->ports[i]);
+                free(p->ports);
+                p->ports = NULL;
+        }
 
         if (p->rdf) {
@@ -123 +127 @@
 
         if (!p->ports) {
-                p->ports = raptor_new_sequence((void (*)(void*))&slv2_port_free, NULL);
+                p->ports = malloc(sizeof(SLV2Port*));
+                p->ports[0] = NULL;
 
                 const unsigned char* query = (const unsigned char*)
@@ -144 +149 @@
                         librdf_node* index_node = librdf_query_results_get_binding_value(results, 2);
 
-                        if (librdf_node_is_literal(symbol_node) &&librdf_node_is_literal(index_node)) {
+                        if (librdf_node_is_literal(symbol_node) && librdf_node_is_literal(index_node)) {
                                 const char* symbol = (const char*)librdf_node_get_literal_value(symbol_node);
                                 const char* index = (const char*)librdf_node_get_literal_value(index_node);
 
                                 const int this_index = atoi(index);
-                                SLV2Port  this_port  = raptor_sequence_get_at(p->ports, this_index);
-
-                                // Havn't seen this port yet, add it to sequence
+                                SLV2Port  this_port  = NULL;
+
+                                assert(this_index >= 0);
+
+                                if (p->num_ports > (unsigned)this_index) {
+                                        this_port = p->ports[this_index];
+                                } else {
+                                        p->ports = realloc(p->ports, (this_index + 1) * sizeof(SLV2Port*));
+                                        memset(p->ports + p->num_ports, '\0',
+                                                        (this_index - p->num_ports) * sizeof(SLV2Port));
+                                        p->num_ports = this_index + 1;
+                                }
+
+                                // Havn't seen this port yet, add it to array
                                 if (!this_port) {
                                         this_port = slv2_port_new(p->world, this_index, symbol);
-                                        raptor_sequence_set_at(p->ports, this_index, this_port);
+                                        p->ports[this_index] = this_port;
                                 }
 
@@ -498 +514 @@
 {
         slv2_plugin_load_ports_if_necessary(p);
-        return raptor_sequence_size(p->ports);
+        return p->num_ports;
 }
 
@@ -509 +525 @@
         slv2_plugin_load_ports_if_necessary(p);
 
-        for (int i = 0; i < raptor_sequence_size(p->ports); ++i)
+        for (uint32_t i = 0; i < p->num_ports; ++i)
                 values[i] = NAN;
 
@@ -571 +587 @@
         va_list  args;
 
-        for (unsigned i=0; i < slv2_plugin_get_num_ports(p); ++i) {
-                SLV2Port port = raptor_sequence_get_at(p->ports, i);
+        for (unsigned i=0; i < p->num_ports; ++i) {
+                SLV2Port port = p->ports[i];
                 if (!slv2_port_is_a(p, port, class_1))
                         continue;
@@ -692 +708 @@
 {
         slv2_plugin_load_ports_if_necessary(p);
-        return raptor_sequence_get_at(p->ports, (int)index);
+        if (index < p->num_ports)
+                return p->ports[index];
+        else
+                return NULL;
 }
 
@@ -701 +720 @@
 {
         slv2_plugin_load_ports_if_necessary(p);
-        for (int i=0; i < raptor_sequence_size(p->ports); ++i) {
-                SLV2Port port = raptor_sequence_get_at(p->ports, i);
+        for (uint32_t i=0; i < p->num_ports; ++i) {
+                SLV2Port port = p->ports[i];
                 if (slv2_value_equals(port->symbol, symbol))
                         return port;

trunk/slv2/src/port.c

@@ -39 +39 @@
         port->symbol = slv2_value_new(world, SLV2_VALUE_STRING, symbol);
         port->classes = slv2_values_new();
-        //port->node_id = strdup(node_id);
         return port;
 }

trunk/slv2/src/slv2_internal.h

@@ -62 +62 @@
         SLV2PluginClass      plugin_class;
         raptor_sequence*     data_uris;  ///< rdfs::seeAlso
-        raptor_sequence*     ports;
+        SLV2Port*            ports;
         librdf_storage*      storage;
         librdf_model*        rdf;
+        uint32_t             num_ports;
 };
 

trunk/slv2/test/slv2_test.c

@@ -555 +555 @@
                         PLUGIN_NAME("Test plugin") " ; "
                         LICENSE_GPL " ; "
-                "lv2:optionalFeature lv2:hardRtCapable ; "
+                        "lv2:optionalFeature lv2:hardRtCapable ; "
                     "lv2:requiredFeature <http://lv2plug.in/ns/ext/event> ; "
                         ":foo 1.6180 ; "