1997-05-07
1997-05-07 23:07:47 by Per Hedbor <ph@opera.com>
-
35aeada5d99b649097dca3c8b02a0d47231919ee
(21 lines)
(+7/-14)
[
Show
| Annotate
]
Branch: 5.2
Patches..
Rev: server/base_server/disk_cache.pike:1.19
Rev: server/base_server/persistent.pike:1.27
Rev: server/base_server/restorable.pike:1.3
Rev: server/base_server/roxen.pike:1.53
Rev: server/base_server/roxenlib.pike:1.24
Rev: server/base_server/roxenloader.pike:1.22
Rev: server/etc/include/module.h:1.9
Rev: server/modules/graphics/graphic_text.pike:1.42
Rev: server/modules/proxies/ftpgateway.pike:1.12
Rev: server/modules/proxies/proxy.pike:1.16
1:
- string cvs_version = "$Id: roxen.pike,v 1.52 1997/05/07 05:19:59 grubba Exp $";
+ string cvs_version = "$Id: roxen.pike,v 1.53 1997/05/07 23:07:37 per Exp $";
#define IN_ROXEN
#ifdef THREADS
#include <fifo.h>
382:
{
if(root && root->descend("Errors", 1))
{
- mapping e = root->descend("Errors")->data;
+ mapping e = root->descend("Errors", 1)->data;
if(!e[s]) e[s]=({ time(1) });
else e[s] += ({ time(1) });
}
- perror(s);
+ roxen_perror(s);
}
1910: Inside #if efun(send_fd)
return;
init_shuffler();
}
- //#if efun(Pipe)
+ // Fallback, when there is no external shuffler.
object p = Pipe.pipe();
p->input(from);
p->output(to);
- //#else
- #if 0
- perror("Shuffle: using fallback(Ouch!)\n");
- // Fallback. Very unlikely.
- from->set_id(to->write);
- from->set_nonblocking(lambda(function w,string s){w(s);},lambda(){},
- lambda(function w){destruct(function_object(w));});
- #endif
+
}
#endif
-
+
#ifdef THREADS
object shuffle_queue = Queue();
1936: Inside #if defined(THREADS)
{
shuffle_queue->write(({a,b}));
}
- #elif efun(send_fd)
+ #else
function shuffle = _shuffle;
#endif
- #endif
+
#ifdef THREADS
object st=thread_create(shuffle_thread);