Mercurial > hg > webserver / file comparison

comparison: src/server/util/system.c

src/server/util/system.c

changeset 24
1a7853a4257e
parent 14
b8bf95b39952
child 29
e8619defde14
equal deleted inserted replaced
23:a2c8fc23c90e 24:1a7853a4257e
90 #endif /* DEBUG_MALLOC */ 90 #endif /* DEBUG_MALLOC */
91 91
92 NSAPI_PUBLIC char *system_version() 92 NSAPI_PUBLIC char *system_version()
93 { 93 {
94 //return PRODUCT_ID"/"PRODUCT_VERSION_ID; 94 //return PRODUCT_ID"/"PRODUCT_VERSION_ID;
95 return "Solaris 11 Express"; 95 return "Solaris 11";
96 } 96 }
97 97
98 NSAPI_PUBLIC pool_handle_t *system_pool(void) 98 NSAPI_PUBLIC pool_handle_t *system_pool(void)
99 { 99 {
100 return MALLOC_KEY; 100 return MALLOC_KEY;
104 { 104 {
105 void *ret; 105 void *ret;
106 ret = pool_malloc(MALLOC_KEY, size); 106 ret = pool_malloc(MALLOC_KEY, size);
107 if (!ret) { 107 if (!ret) {
108 //ereport_outofmemory(); 108 //ereport_outofmemory();
109 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 109 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); // TODO
110 } 110 }
111 return ret; 111 return ret;
112 } 112 }
113 113
114 114
118 ret = pool_malloc(MALLOC_KEY, size); 118 ret = pool_malloc(MALLOC_KEY, size);
119 if(ret) { 119 if(ret) {
120 ZERO(ret, size); 120 ZERO(ret, size);
121 } else { 121 } else {
122 //ereport_outofmemory(); 122 //ereport_outofmemory();
123 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 123 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); // TODO
124 } 124 }
125 return ret; 125 return ret;
126 } 126 }
127 127
128 128
130 { 130 {
131 void *ret; 131 void *ret;
132 ret = pool_realloc(MALLOC_KEY, ptr, size); 132 ret = pool_realloc(MALLOC_KEY, ptr, size);
133 if (!ret) { 133 if (!ret) {
134 //ereport_outofmemory(); 134 //ereport_outofmemory();
135 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 135 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
136 } 136 }
137 return ret; 137 return ret;
138 } 138 }
139 139
140 140
148 //NS_ASSERT(ptr); 148 //NS_ASSERT(ptr);
149 char *ret; 149 char *ret;
150 ret = pool_strdup(MALLOC_KEY, ptr); 150 ret = pool_strdup(MALLOC_KEY, ptr);
151 if (!ret) { 151 if (!ret) {
152 //ereport_outofmemory(); 152 //ereport_outofmemory();
153 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 153 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
154 } 154 }
155 return ret; 155 return ret;
156 } 156 }
157 157
158 158
182 182
183 ret = real_ptr; 183 ret = real_ptr;
184 #endif 184 #endif
185 if (!ret) { 185 if (!ret) {
186 //ereport_outofmemory(); 186 //ereport_outofmemory();
187 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 187 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
188 } 188 }
189 return ret; 189 return ret;
190 } 190 }
191 191
192 NSAPI_PUBLIC void *system_calloc_perm(int size) 192 NSAPI_PUBLIC void *system_calloc_perm(int size)
232 } 232 }
233 #endif 233 #endif
234 234
235 if (!ret) { 235 if (!ret) {
236 //ereport_outofmemory(); 236 //ereport_outofmemory();
237 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 237 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
238 } 238 }
239 239
240 return ret; 240 return ret;
241 } 241 }
242 242
296 ret = nptr; 296 ret = nptr;
297 #endif 297 #endif
298 298
299 if (!ret) { 299 if (!ret) {
300 //ereport_outofmemory(); 300 //ereport_outofmemory();
301 PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0); 301 //PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
302 } 302 }
303 303
304 return ret; 304 return ret;
305 } 305 }
306 306
334 } 334 }
335 335
336 NSAPI_PUBLIC void 336 NSAPI_PUBLIC void
337 InitThreadMallocKey(void) 337 InitThreadMallocKey(void)
338 { 338 {
339 PR_NewThreadPrivateIndex((unsigned int *)&thread_malloc_key, NULL); 339 // TODO
340 PR_ASSERT(thread_malloc_key); 340 //PR_NewThreadPrivateIndex((unsigned int *)&thread_malloc_key, NULL);
341 //PR_ASSERT(thread_malloc_key);
341 } 342 }
342 343
343 #ifdef XP_WIN32 344 #ifdef XP_WIN32
344 static int _cdecl system_newhandler(unsigned int size) 345 static int _cdecl system_newhandler(unsigned int size)
345 { 346 {

Mercurial Repository: webserver

mercurial