Changeset 213 in flair-src for trunk/lib/FlairCore/src/Widget_impl.cpp

Timestamp:

Jan 30, 2018, 5:47:12 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

thread stack size rework
add Matrix class

File:

• trunk/lib/FlairCore/src/Widget_impl.cpp (modified) (7 diffs)

trunk/lib/FlairCore/src/Widget_impl.cpp

@@ -33 +33 @@
 namespace {
 #ifdef __XENO__
-RT_HEAP xml_heap;
-
-void xml2_free(void *mem) {
+RT_HEAP rt_xml_heap;
+
+void rt_xml2_free(void *mem) {
   // Printf("free %x\n",mem);
   if (mem == NULL)
     return;
-  int status = rt_heap_free(&xml_heap, mem);
+  int status = rt_heap_free(&rt_xml_heap, mem);
 
   if (status != 0) {
@@ -47 +47 @@
 }
 
-void *xml2_alloc(size_t sz) {
+void *rt_xml2_alloc(size_t sz) {
   void *ptr;
   // printf("alloc %i\n",sz);
-  int status = rt_heap_alloc(&xml_heap, sz, TM_NONBLOCK, &ptr);
+  int status = rt_heap_alloc(&rt_xml_heap, sz, TM_NONBLOCK, &ptr);
   if (status != 0) {
                 char errorMsg[256];
@@ -60 +60 @@
 }
 
-void *xml2_realloc(void *emem, size_t sz) {
+void *rt_xml2_realloc(void *emem, size_t sz) {
   // Printf("realloc %x %i -> %i\n",emem,sz,sz);
   void *mem_re;
 
   if (emem == NULL) {
-    return xml2_alloc(sz);
+    return rt_xml2_alloc(sz);
   } else if (sz == 0) {
-    xml2_free(emem);
-  }
-
-  mem_re = xml2_alloc(sz);
+    rt_xml2_free(emem);
+  }
+
+  mem_re = rt_xml2_alloc(sz);
 
   memcpy(mem_re, emem, sz);
 
-  xml2_free(emem);
+  rt_xml2_free(emem);
 
   return mem_re;
 }
 
-char *xml2_strdup(const char *str) {
+char *rt_xml2_strdup(const char *str) {
   // printf("strdup %s\n",str);
-  char *s = (char *)xml2_alloc(strlen(str) + 1);
+  char *s = (char *)rt_xml2_alloc(strlen(str) + 1);
   if (s == NULL)
     return NULL;
@@ -103 +103 @@
     string tmp_name;
     tmp_name = name + "-xml";
-    int status = rt_heap_create(&xml_heap, tmp_name.c_str(), XML_HEAP, H_FIFO);
+    int status = rt_heap_create(&rt_xml_heap, tmp_name.c_str(), RT_XML_HEAP, H_FIFO);
     if (status != 0) {
                         char errorMsg[256];
@@ -109 +109 @@
     }
 
-    xmlMemSetup(xml2_free, xml2_alloc, xml2_realloc, xml2_strdup);
+    xmlMemSetup(rt_xml2_free, rt_xml2_alloc, rt_xml2_realloc, rt_xml2_strdup);
 #endif //__XENO__
   }
@@ -188 +188 @@
 #ifdef __XENO__
     int status;
-                char errorMsg[256];
     RT_HEAP_INFO info;
-    status = rt_heap_inquire(&xml_heap, &info);
+    status = rt_heap_inquire(&rt_xml_heap, &info);
     if (status != 0) {
+      char errorMsg[256];
       self->Err("rt_heap_inquire error (%s)\n", strerror_r(-status, errorMsg, sizeof(errorMsg)));
     }
@@ -197 +197 @@
       self->Err("fuite memoire xml heap (%ld)\n", info.usedmem);
     // Printf("fin heap xml\n");
-    status = rt_heap_delete(&xml_heap);
+    status = rt_heap_delete(&rt_xml_heap);
     if (status != 0) {
+      char errorMsg[256];
       self->Err("rt_heap_delete error (%s)\n", strerror_r(-status, errorMsg, sizeof(errorMsg)));
     }