ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.355 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.401 by root, Mon Dec 17 06:45:53 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 76our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 79our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
83 81
84our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 86our $DB_ENV;
86 87
87our %CFG; 88our %CFG;
88 89
89our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 91our $RUNTIME;
92our $NOW;
91 93
92our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
96# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 100
159 161
160The raw value load value from the last tick. 162The raw value load value from the last tick.
161 163
162=item %cf::CFG 164=item %cf::CFG
163 165
164Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 167from wherever your confdir points to.
166 168
167=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
168 170
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
213)) { 214)) {
214 no strict 'refs'; 215 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 217}
217 218
218$Event::DIED = sub { 219$EV::DIED = sub {
219 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
220}; 221};
221 222
222############################################################################# 223#############################################################################
223 224
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 248 $d
248 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
249} 250}
250 251
251=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
252 253
253Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
254 255
255=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
256 257
257Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
258 259
259=cut 260=cut
260 261
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 263
263sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
265 266
266=item cf::lock_wait $string 267=item cf::lock_wait $string
267 268
268Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
269 270
285Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
286 287
287=cut 288=cut
288 289
289our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
290 292
291sub lock_wait($) { 293sub lock_wait($) {
292 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
293 300
294 # wait for lock, if any 301 # wait for lock, if any
295 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 304 Coro::schedule;
303 310
304 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
305 lock_wait $key; 312 lock_wait $key;
306 313
307 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
308 316
309 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
312 } 321 }
313} 322}
314 323
326 }; 335 };
327 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
328 $guard 337 $guard
329} 338}
330 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
331=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
332 356
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
344our @SLOT_QUEUE; 368our @SLOT_QUEUE;
345our $SLOT_QUEUE; 369our $SLOT_QUEUE;
346 370
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
349 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
350 376
351 while () { 377 while () {
352 next_job: 378 next_job:
353 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
361 } 387 }
362 } 388 }
363 } 389 }
364 390
365 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 394 $signal->wait;
369 } else { 395 } else {
370 Coro::schedule; 396 Coro::schedule;
371 } 397 }
394 420
395BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
396 422
397=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
398 424
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 428acceptable.
403 429
404If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
410 436
411sub sync_job(&) { 437sub sync_job(&) {
412 my ($job) = @_; 438 my ($job) = @_;
413 439
414 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 441 my $time = EV::time;
416 442
417 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
419 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
420 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 449 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
423 451
424 my $busy = 1; 452 my $busy = 1;
425 my @res; 453 my @res;
426 454
427 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 457 @res = eval { $job->() };
429 warn $@ if $@; 458 warn $@ if $@;
430 undef $busy; 459 undef $busy;
431 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
432 461
433 while ($busy) { 462 while ($busy) {
434 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
435 } 467 }
468 }
436 469
437 $time = Event::time - $time; 470 $time = EV::time - $time;
438 471
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 474
442 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
472=item fork_call { }, $args 505=item fork_call { }, $args
473 506
474Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
478 511
479=cut 512=cut
480 513
481sub fork_call(&@) { 514sub fork_call(&@) {
482 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
500=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
501 534
502Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
505=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
506 561
507our $DB; 562our $DB;
508 563
509sub db_init { 564sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 565 cf::sync_job {
514 eval { 566 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 567 };
524} 568}
525 569
526sub db_get($$) { 570sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
528 572
632attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
634 678
635In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 681Deliantra).
638 682
639=over 4 683=over 4
640 684
641=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
642 686
940 984
941=cut 985=cut
942 986
943############################################################################# 987#############################################################################
944# object support 988# object support
945#
946 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
947sub _can_merge { 1023sub _can_merge {
948 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
949 1025
950 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1027
954 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
955} 1030}
956 1031
957sub reattach { 1032sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1034 my ($obj) = @_;
981cf::attachable->attach ( 1056cf::attachable->attach (
982 prio => -1000000, 1057 prio => -1000000,
983 on_instantiate => sub { 1058 on_instantiate => sub {
984 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
985 1060
986 $data = from_json $data; 1061 $data = decode_json $data;
987 1062
988 for (@$data) { 1063 for (@$data) {
989 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
990 1065
991 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1082sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1009 1084
1010 sync_job { 1085 sync_job {
1011 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1014 1090
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1095 close $fh;
1020 1096
1021 if (@$objs) { 1097 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1103 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1105 }
1037 } 1113 }
1038 } else { 1114 } else {
1039 aio_unlink $filename; 1115 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1041 } 1117 }
1042 } 1118 };
1043} 1119}
1044 1120
1045sub object_freezer_as_string { 1121sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1047 1123
1059 or return; 1135 or return;
1060 1136
1061 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1139 or return;
1140
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1065 } 1143 }
1066 1144
1145 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1069 return ($data, $av); 1149 ($data, $av)
1070} 1150}
1071 1151
1072=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1073 1153
1074=over 4 1154=over 4
1260 1340
1261=head3 cf::player 1341=head3 cf::player
1262 1342
1263=over 4 1343=over 4
1264 1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1358
1265=item cf::player::find $login 1359=item cf::player::find $login
1266 1360
1267Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1268 1362
1269=cut 1363=cut
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1402
1309 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1312 } 1411 }
1313 } 1412 }
1314} 1413}
1315 1414
1463 1562
1464Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1465 1564
1466=cut 1565=cut
1467 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1468sub expand_cfpod { 1578sub expand_cfpod {
1469 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1470 1580
1471 # escape & and < 1581 my $xml;
1472 s/&/&amp;/g;
1473 s/(?<![BIUGHT])</&lt;/g;
1474 1582
1475 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1476 1586
1477 1 while 1587 $group =~ s/&/&amp;/g;
1478 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1479 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1480 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1481 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1592 ([BCGHITU])
1483 # replace G<male|female> tags 1593 <
1484 || s{G<([^>|]*)\|([^>]*)>}{ 1594 (?:
1485 $self->gender ? $2 : $1 1595 ([^<>]*) (?{ $group = $^N })
1486 }ge 1596 | < $interior >
1487 # replace H<hint text> 1597 )
1488 || s{H<([^\>]*)>} 1598 >
1599 %gcsx
1489 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1490 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1491 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1492 "") 1620 "")
1493 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1494 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1495 1632
1633 for ($xml) {
1496 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1497 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1498 1636
1499 # compress some whitespace 1637 # compress some whitespace
1500 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1501 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1502 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1503 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1504 1643
1505 $_ 1644 $xml
1506} 1645}
1646
1647no re 'eval';
1507 1648
1508sub hintmode { 1649sub hintmode {
1509 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1510 $_[0]{hintmode} 1651 $_[0]{hintmode}
1511} 1652}
1755 1896
1756sub load_header_from($) { 1897sub load_header_from($) {
1757 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1758 1899
1759 utf8::encode $path; 1900 utf8::encode $path;
1760 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1761 # or return;
1762
1763 $self->_load_header ($path)
1764 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1765 1909
1766 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1767 1911
1768 1 1912 1
1769} 1913}
1823sub find { 1967sub find {
1824 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1825 1969
1826 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1827 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1828 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1829 1974
1830 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1831 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1832 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1833 or return; 1980 or return;
1834 1981
1835 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1836 1983
1838 or return; 1985 or return;
1839 1986
1840 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1841 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1842 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1843 $map->reset; 1992 $map->reset;
1844 undef $guard;
1845 return find $path; 1993 return find $path;
1846 } 1994 }
1847 1995
1848 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1849 } 1997 }
1858 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1859 2007
1860 my $path = $self->{path}; 2008 my $path = $self->{path};
1861 2009
1862 { 2010 {
1863 my $guard1 = cf::lock_acquire "map_data:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1864 my $guard2 = cf::lock_acquire "map_load:$path";
1865 2012
2013 return unless $self->valid;
1866 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1867 2015
1868 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1869 2017
1870 $self->alloc; 2018 $self->alloc;
1871 2019
1872 $self->pre_load; 2020 $self->pre_load;
1873 cf::cede_to_tick; 2021 cf::cede_to_tick;
1874 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1875 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1876 or return; 2026 or return;
1877 2027
1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1879 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1880 2030
1881 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1882 utf8::encode $uniq; 2032 utf8::encode $uniq;
1883 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1884 $self->clear_unique_items; 2035 $self->clear_unique_items;
1885 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1886 } 2039 }
1887 } 2040 }
2041
2042 $f->resolve_delayed_derefs;
1888 2043
1889 cf::cede_to_tick; 2044 cf::cede_to_tick;
1890 # now do the right thing for maps 2045 # now do the right thing for maps
1891 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1892 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1978 } 2133 }
1979 2134
1980 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
1981 2136
1982 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1983 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1984 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $k) { 2142 if (my $map = find $k) {
1986 $map->load if $v; 2143 $map->load if $v;
1987 } 2144 }
2013 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2014 2171
2015 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2016 2173
2017 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2019 }; 2177 };
2020 2178
2021 if ($uniq) { 2179 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2036 2194
2037 return if $self->players; 2195 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2197 return if $self->{deny_save};
2040 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2203 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2204}
2044 2205
2045sub reset_at { 2206sub reset_at {
2046 my ($self) = @_; 2207 my ($self) = @_;
2047 2208
2079 if $uniq; 2240 if $uniq;
2080 } 2241 }
2081 2242
2082 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2083 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2247 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2248
2088 $self->unlink_save; 2249 $self->unlink_save;
2089 $self->destroy; 2250 $self->destroy;
2090} 2251}
2091 2252
2192 2353
2193sub inv_recursive { 2354sub inv_recursive {
2194 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2195} 2356}
2196 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
2197package cf; 2386package cf;
2198 2387
2199=back 2388=back
2200 2389
2201=head3 cf::object::player 2390=head3 cf::object::player
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2549
2361 $self->enter_link; 2550 $self->enter_link;
2362 2551
2363 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2364 my $map = eval { 2574 my $map = eval {
2365 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2366 2576
2367 if ($map) { 2577 if ($map) {
2368 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2370 } else { 2580 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2582 }
2373 2583
2374 $map 2584 $map
2375 }; 2585 };
2376 2586
2429 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2430 } 2640 }
2431 2641
2432 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2433 2643
2434 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2435 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2437 2647
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2466 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2469 2679
2470 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2471 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2684 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2474 2686
2475 1; 2687 1;
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2512 2724
2513=cut 2725=cut
2514 2726
2727# non-persistent channels (usually the info channel)
2515our %CHANNEL = ( 2728our %CHANNEL = (
2516 "c/identify" => { 2729 "c/identify" => {
2517 id => "identify", 2730 id => "infobox",
2518 title => "Identify", 2731 title => "Identify",
2519 reply => undef, 2732 reply => undef,
2520 tooltip => "Items recently identified", 2733 tooltip => "Items recently identified",
2521 }, 2734 },
2522 "c/examine" => { 2735 "c/examine" => {
2523 id => "examine", 2736 id => "infobox",
2524 title => "Examine", 2737 title => "Examine",
2525 reply => undef, 2738 reply => undef,
2526 tooltip => "Signs and other items you examined", 2739 tooltip => "Signs and other items you examined",
2527 }, 2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2528); 2777);
2529 2778
2530sub cf::client::send_msg { 2779sub cf::client::send_msg {
2531 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2532 2781
2533 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2534 2783
2535 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536 2785
2537 # check predefined channels, for the benefit of C 2786 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2539 2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2540 if (ref $channel) { 2795 } elsif (ref $channel) {
2541 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel) 2799 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg; 2800 if $self->can_msg;
2762=pod 3017=pod
2763 3018
2764The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2765 3020
2766 cf::object 3021 cf::object
2767 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2768 insert remove name archname title slaying race decrease_ob_nr 3023 insert remove name archname title slaying race decrease_ob_nr
2769 3024
2770 cf::object::player 3025 cf::object::player
2771 player 3026 player
2772 3027
2779=cut 3034=cut
2780 3035
2781for ( 3036for (
2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race 3038 insert remove inv name archname title slaying race
2784 decrease_ob_nr)], 3039 decrease_ob_nr destroy)],
2785 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2786 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2787 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2788) { 3043) {
2789 no strict 'refs'; 3044 no strict 'refs';
3064sub main { 3319sub main {
3065 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3066 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3067 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3068 (async { 3323 (async {
3069 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3070 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3071 }; 3327 };
3072 3328
3073 reload_config; 3329 reload_config;
3074 db_init; 3330 db_init;
3075 load_extensions; 3331 load_extensions;
3076 3332
3077 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3078 Event::loop; 3335 EV::loop;
3079} 3336}
3080 3337
3081############################################################################# 3338#############################################################################
3082# initialisation and cleanup 3339# initialisation and cleanup
3083 3340
3084# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3085BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3086 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3087 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3088 reentrant => 0,
3089 data => WF_AUTOCANCEL,
3090 signal => $signal,
3091 prio => 0,
3092 cb => sub {
3093 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3094 },
3095 ); 3347 };
3096 } 3348 }
3097} 3349}
3098 3350
3099sub write_runtime { 3351sub write_runtime {
3100 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3145 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3146 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3147 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3148 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3149 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3150 $pl->save; 3403 $pl->save;
3151 } 3404 }
3152 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3153 3406
3154 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3193 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3194 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3195 3448
3196 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3197 3450
3198 warn "cancelling all WF_AUTOCANCEL watchers";
3199 for (Event::all_watchers) {
3200 $_->cancel if $_->data & WF_AUTOCANCEL;
3201 }
3202
3203 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3204 for (;;) { 3452 for (;;) {
3205 BDB::flush; 3453 BDB::flush;
3206 IO::AIO::flush; 3454 IO::AIO::flush;
3207 Coro::cede; 3455 Coro::cede_notself;
3208 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3209 warn "iterate..."; 3457 warn "iterate...";
3210 } 3458 }
3211 3459
3212 ++$RELOAD; 3460 ++$RELOAD;
3301 3549
3302sub reload_perl() { 3550sub reload_perl() {
3303 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3304 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3305 3553
3306 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3307 reentrant => 0,
3308 after => 0,
3309 data => WF_AUTOCANCEL,
3310 cb => sub {
3311 do_reload_perl;
3312 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3313 }, 3556 do_reload_perl;
3314 ); 3557 };
3315} 3558}
3316 3559
3317register_command "reload" => sub { 3560register_command "reload" => sub {
3318 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3319 3562
3320 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3321 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3322 async { reload_perl }; 3567 reload_perl;
3568 };
3323 } 3569 }
3324}; 3570};
3325 3571
3326unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3327 3573
3346 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3347 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3348 $signal->wait; 3594 $signal->wait;
3349} 3595}
3350 3596
3351 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3352 my $avg = 10;
3353$TICK_WATCHER = Event->timer (
3354 reentrant => 0,
3355 parked => 1,
3356 prio => 0,
3357 at => $NEXT_TICK || $TICK,
3358 data => WF_AUTOCANCEL,
3359 cb => sub {
3360 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3361 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3362 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3363 return; 3601 return;
3364 } 3602 }
3365 3603
3366 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3367 3605
3368 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3369 3607
3370 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3371 for(1..10) { 3609 $NEXT_TICK += $TICK;
3372 my $t = Event::time;
3373 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3374 or die;
3375 3610
3376 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3377 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
3378 $map->alloc; 3613 Coro::async_pool {
3379 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3380 my $t = Event::time - $t; 3615 write_runtime
3381 3616 or warn "ERROR: unable to write runtime file: $!";
3382 #next unless $t < 0.0013;#d#
3383 if ($t < $min) {
3384 $min = $t;
3385 }
3386 $avg = $avg * 0.99 + $t * 0.01;
3387 }
3388 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3389 exit 0;
3390 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3391 }; 3617 };
3618 }
3392 3619
3393 $RUNTIME += $TICK;
3394 $NEXT_TICK += $TICK;
3395
3396 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3397 $NEXT_RUNTIME_WRITE = $NOW + 10;
3398 Coro::async_pool {
3399 write_runtime
3400 or warn "ERROR: unable to write runtime file: $!";
3401 };
3402 }
3403
3404# my $AFTER = Event::time;
3405# warn $AFTER - $NOW;#d#
3406
3407 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3408 $sig->send; 3621 $sig->send;
3409 } 3622 }
3410 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3411 $sig->send; 3624 $sig->send;
3412 } 3625 }
3413 3626
3414 $NOW = Event::time;
3415
3416 # if we are delayed by four ticks or more, skip them all
3417 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3418
3419 $TICK_WATCHER->at ($NEXT_TICK);
3420 $TICK_WATCHER->start;
3421
3422 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3423 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3424 3629
3425 _post_tick; 3630 _post_tick;
3426 3631};
3427 3632$TICK_WATCHER->priority (EV::MAXPRI);
3428 },
3429);
3430 3633
3431{ 3634{
3432 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3433 $BDB_POLL_WATCHER = Event->io ( 3636
3434 reentrant => 0,
3435 fd => BDB::poll_fileno,
3436 poll => 'r',
3437 prio => 0,
3438 data => WF_AUTOCANCEL,
3439 cb => \&BDB::poll_cb,
3440 );
3441 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3442 3638 BDB::max_poll_reqs $TICK * 0.1;
3443 BDB::set_sync_prepare {
3444 my $status;
3445 my $current = $Coro::current;
3446 (
3447 sub {
3448 $status = $!;
3449 $current->ready; undef $current;
3450 },
3451 sub {
3452 Coro::schedule while defined $current;
3453 $! = $status;
3454 },
3455 )
3456 };
3457 3639
3458 unless ($DB_ENV) { 3640 unless ($DB_ENV) {
3459 $DB_ENV = BDB::db_env_create; 3641 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3643 | BDB::LOG_AUTOREMOVE, 1);
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3460 3646
3461 cf::sync_job { 3647 cf::sync_job {
3462 eval { 3648 eval {
3463 BDB::db_env_open 3649 BDB::db_env_open
3464 $DB_ENV, 3650 $DB_ENV,
3466 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3652 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3467 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3653 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3468 0666; 3654 0666;
3469 3655
3470 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3656 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3471
3472 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3473 $DB_ENV->set_lk_detect;
3474 }; 3657 };
3475 3658
3476 cf::cleanup "db_env_open(db): $@" if $@; 3659 cf::cleanup "db_env_open(db): $@" if $@;
3477 }; 3660 };
3478 } 3661 }
3662
3663 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3664 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3665 };
3666 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3667 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3668 };
3669 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3670 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3671 };
3479} 3672}
3480 3673
3481{ 3674{
3675 # configure IO::AIO
3676
3482 IO::AIO::min_parallel 8; 3677 IO::AIO::min_parallel 8;
3483
3484 undef $Coro::AIO::WATCHER;
3485 IO::AIO::max_poll_time $TICK * 0.1; 3678 IO::AIO::max_poll_time $TICK * 0.1;
3486 $AIO_POLL_WATCHER = Event->io (
3487 reentrant => 0,
3488 data => WF_AUTOCANCEL,
3489 fd => IO::AIO::poll_fileno,
3490 poll => 'r',
3491 prio => 6,
3492 cb => \&IO::AIO::poll_cb,
3493 );
3494} 3679}
3495 3680
3496my $_log_backtrace; 3681my $_log_backtrace;
3497 3682
3498sub _log_backtrace { 3683sub _log_backtrace {
3502 3687
3503 # limit the # of concurrent backtraces 3688 # limit the # of concurrent backtraces
3504 if ($_log_backtrace < 2) { 3689 if ($_log_backtrace < 2) {
3505 ++$_log_backtrace; 3690 ++$_log_backtrace;
3506 async { 3691 async {
3692 $Coro::current->{desc} = "abt $msg";
3693
3507 my @bt = fork_call { 3694 my @bt = fork_call {
3508 @addr = map { sprintf "%x", $_ } @addr; 3695 @addr = map { sprintf "%x", $_ } @addr;
3509 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3696 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3510 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3697 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3511 or die "addr2line: $!"; 3698 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines