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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 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 1.86;
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 ();
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
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 84our $DB_ENV;
86 85
87our %CFG; 86our %CFG;
88 87
89our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 89our $RUNTIME;
90our $NOW;
91 91
92our (%PLAYER, %PLAYER_LOADING); # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
… …
159 159
160The raw value load value from the last tick. 160The raw value load value from the last tick.
161 161
162=item %cf::CFG 162=item %cf::CFG
163 163
164Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 165from wherever your confdir points to.
166 166
167=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
168 168
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
… …
334 }; 348 };
335 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
336 $guard 350 $guard
337} 351}
338 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
339=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
340 369
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
352our @SLOT_QUEUE; 381our @SLOT_QUEUE;
353our $SLOT_QUEUE; 382our $SLOT_QUEUE;
354 383
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
357 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
358 389
359 while () { 390 while () {
360 next_job: 391 next_job:
361 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
369 } 400 }
370 } 401 }
371 } 402 }
372 403
373 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 407 $signal->wait;
377 } else { 408 } else {
378 Coro::schedule; 409 Coro::schedule;
379 } 410 }
… …
402 433
403BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
404 435
405=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
406 437
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 441acceptable.
411 442
412If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
418 449
419sub sync_job(&) { 450sub sync_job(&) {
420 my ($job) = @_; 451 my ($job) = @_;
421 452
422 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 454 my $time = EV::time;
424 455
425 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
427 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
428 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 462 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
431 464
432 my $busy = 1; 465 my $busy = 1;
433 my @res; 466 my @res;
434 467
435 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 470 @res = eval { $job->() };
437 warn $@ if $@; 471 warn $@ if $@;
438 undef $busy; 472 undef $busy;
439 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
440 474
441 while ($busy) { 475 while ($busy) {
442 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
443 } 480 }
481 }
444 482
445 $time = Event::time - $time; 483 $time = EV::time - $time;
446 484
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449 487
450 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
480=item fork_call { }, $args 518=item fork_call { }, $args
481 519
482Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
486 524
487=cut 525=cut
488 526
489sub fork_call(&@) { 527sub fork_call(&@) {
490 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
508=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
509 547
510Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
513=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
514 574
515our $DB; 575our $DB;
516 576
517sub db_init { 577sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 578 cf::sync_job {
522 eval { 579 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 580 };
532} 581}
533 582
534sub db_get($$) { 583sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
536 585
… …
640attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
642 691
643In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 694Deliantra).
646 695
647=over 4 696=over 4
648 697
649=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
650 699
… …
932 } 981 }
933 982
934 0 983 0
935} 984}
936 985
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 987
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 989
941Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
942 991
… …
948 997
949=cut 998=cut
950 999
951############################################################################# 1000#############################################################################
952# object support 1001# object support
953#
954 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
955sub _can_merge { 1036sub _can_merge {
956 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
957 1038
958 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1040
962 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
963} 1043}
964 1044
965sub reattach { 1045sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1047 my ($obj) = @_;
… …
989cf::attachable->attach ( 1069cf::attachable->attach (
990 prio => -1000000, 1070 prio => -1000000,
991 on_instantiate => sub { 1071 on_instantiate => sub {
992 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
993 1073
994 $data = from_json $data; 1074 $data = decode_json $data;
995 1075
996 for (@$data) { 1076 for (@$data) {
997 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
998 1078
999 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1013); 1093);
1014 1094
1015sub object_freezer_save { 1095sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1017 1097
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1098 sync_job {
1021 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1024 1103
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1108 close $fh;
1030 1109
1031 if (@$objs) { 1110 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1116 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1118 }
… …
1048 } else { 1127 } else {
1049 aio_unlink $filename; 1128 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1051 } 1130 }
1052 }; 1131 };
1053
1054 undef $guard;
1055} 1132}
1056 1133
1057sub object_freezer_as_string { 1134sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1059 1136
… …
1064 1141
1065sub object_thawer_load { 1142sub object_thawer_load {
1066 my ($filename) = @_; 1143 my ($filename) = @_;
1067 1144
1068 my ($data, $av); 1145 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1146
1072 (aio_load $filename, $data) >= 0 1147 (aio_load $filename, $data) >= 0
1073 or return; 1148 or return;
1074 1149
1075 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1152 or return;
1078 1153
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1081 } 1156 }
1082 1157
1158 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1085 1161
1086 ($data, $av) 1162 ($data, $av)
1087} 1163}
1088 1164
1089=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
… …
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1415
1340 my $f = new_from_file cf::object::thawer path $login 1416 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1417 or return;
1342 1418
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1419 my $pl = cf::player::load_pl $f
1345 or return; 1420 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1421 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1422 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
… …
1500 1575
1501Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1502 1577
1503=cut 1578=cut
1504 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1505sub expand_cfpod { 1591sub expand_cfpod {
1506 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1507 1593
1508 # escape & and < 1594 my $xml;
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511 1595
1512 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1513 1599
1514 1 while 1600 $group =~ s/&/&amp;/g;
1515 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1516 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1517 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1518 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1605 ([BCGHITU])
1520 # replace G<male|female> tags 1606 <
1521 || s{G<([^>|]*)\|([^>]*)>}{ 1607 (?:
1522 $self->gender ? $2 : $1 1608 ([^<>]*) (?{ $group = $^N })
1523 }ge 1609 | < $interior >
1524 # replace H<hint text> 1610 )
1525 || s{H<([^\>]*)>} 1611 >
1612 %gcsx
1526 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "") 1633 "")
1530 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1531 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1532 1645
1646 for ($xml) {
1533 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1535 1649
1536 # compress some whitespace 1650 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1541 1656
1542 $_ 1657 $xml
1543} 1658}
1659
1660no re 'eval';
1544 1661
1545sub hintmode { 1662sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode} 1664 $_[0]{hintmode}
1548} 1665}
… …
2029 } 2146 }
2030 2147
2031 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2032 2149
2033 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
2034 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2155 if (my $map = find $k) {
2037 $map->load if $v; 2156 $map->load if $v;
2038 } 2157 }
… …
2064 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2065 2184
2066 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2067 2186
2068 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2070 }; 2190 };
2071 2191
2072 if ($uniq) { 2192 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2260=cut 2380=cut
2261 2381
2262sub deref { 2382sub deref {
2263 my ($ref) = @_; 2383 my ($ref) = @_;
2264 2384
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2386 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2388 or return;
2272 $pl->ob->uuid eq $uuid 2389 $pl->ob->uuid eq $uuid
2273 or return; 2390 or return;
… …
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2562
2446 $self->enter_link; 2563 $self->enter_link;
2447 2564
2448 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2449 my $map = eval { 2587 my $map = eval {
2450 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2451 2589
2452 if ($map) { 2590 if ($map) {
2453 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2455 } else { 2593 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2595 }
2458 2596
2459 $map 2597 $map
2460 }; 2598 };
2461 2599
… …
2514 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2515 } 2653 }
2516 2654
2517 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2518 2656
2519 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2520 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2522 2660
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
… …
2551 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2554 2692
2555 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2556 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2557 unless (eval { 2697 unless (eval {
2558 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2559 2699
2560 1; 2700 1;
… …
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2597 2737
2598=cut 2738=cut
2599 2739
2740# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2741our %CHANNEL = (
2601 "c/identify" => { 2742 "c/identify" => {
2602 id => "identify", 2743 id => "infobox",
2603 title => "Identify", 2744 title => "Identify",
2604 reply => undef, 2745 reply => undef,
2605 tooltip => "Items recently identified", 2746 tooltip => "Items recently identified",
2606 }, 2747 },
2607 "c/examine" => { 2748 "c/examine" => {
2608 id => "examine", 2749 id => "infobox",
2609 title => "Examine", 2750 title => "Examine",
2610 reply => undef, 2751 reply => undef,
2611 tooltip => "Signs and other items you examined", 2752 tooltip => "Signs and other items you examined",
2612 }, 2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2613); 2790);
2614 2791
2615sub cf::client::send_msg { 2792sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2794
2618 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2619 2796
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2798
2622 # check predefined channels, for the benefit of C 2799 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2624 2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2625 if (ref $channel) { 2808 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2812 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2813 if $self->can_msg;
… …
2847=pod 3030=pod
2848 3031
2849The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2850 3033
2851 cf::object 3034 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3036 insert remove name archname title slaying race decrease_ob_nr
2854 3037
2855 cf::object::player 3038 cf::object::player
2856 player 3039 player
2857 3040
… …
2864=cut 3047=cut
2865 3048
2866for ( 3049for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3051 insert remove inv name archname title slaying race
2869 decrease_ob_nr)], 3052 decrease_ob_nr destroy)],
2870 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2873) { 3056) {
2874 no strict 'refs'; 3057 no strict 'refs';
… …
2979 { 3162 {
2980 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2981 3164
2982 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2984 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988 3172
2989 cf::cede_to_tick; 3173 cf::cede_to_tick;
2990 } 3174 }
2991 3175
2992 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2994 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2995 or next; 3180 or next;
3181
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3185 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3018 { 3204 {
3019 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
3022 3208
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data; 3212 my $data;
3028 3213
3029 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
3030 # prepend meta info 3215 # prepend meta info
3031 3216
3032 my $meta = $enc->encode ({ 3217 my $meta = $enc->encode ({
3033 name => $name, 3218 name => $name,
3034 %{ $info->{meta} || {} }, 3219 %{ $info->{meta} || {} },
3035 }); 3220 });
3036 3221
3037 $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
3038 } else { 3229 } else {
3039 $data = $info->{data}; 3230 $RESOURCE{$name} = $info;
3040 } 3231 }
3041 3232
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3233 cf::cede_to_tick;
3046 } 3234 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3238
3067 1 3239 1
3068} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3069 3261
3070register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
3072 3264
3073 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
… …
3128sub reload_config { 3320sub reload_config {
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3322 or return;
3131 3323
3132 local $/; 3324 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
3134 3326
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3328
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3138 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3149sub main { 3341sub main {
3150 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3345 (async {
3154 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3156 }; 3349 };
3157 3350
3158 reload_config; 3351 reload_config;
3159 db_init; 3352 db_init;
3160 load_extensions; 3353 load_extensions;
3161 3354
3162 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3163 Event::loop; 3357 EV::loop;
3164} 3358}
3165 3359
3166############################################################################# 3360#############################################################################
3167# initialisation and cleanup 3361# initialisation and cleanup
3168 3362
3169# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3170BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
3179 },
3180 ); 3369 };
3181 } 3370 }
3182} 3371}
3183 3372
3184sub write_runtime { 3373sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
… …
3230 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3425 $pl->save;
3236 } 3426 }
3237 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3238 3428
3239 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
… …
3278 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3470
3281 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3282 3472
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
3289 for (;;) { 3474 for (;;) {
3290 BDB::flush; 3475 BDB::flush;
3291 IO::AIO::flush; 3476 IO::AIO::flush;
3292 Coro::cede; 3477 Coro::cede_notself;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate..."; 3479 warn "iterate...";
3295 } 3480 }
3296 3481
3297 ++$RELOAD; 3482 ++$RELOAD;
… …
3386 3571
3387sub reload_perl() { 3572sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3390 3575
3391 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl; 3577 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3398 },
3399 ); 3579 };
3400} 3580}
3401 3581
3402register_command "reload" => sub { 3582register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3404 3584
3405 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3589 reload_perl;
3590 };
3408 } 3591 }
3409}; 3592};
3410 3593
3411unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3412 3595
… …
3431 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3616 $signal->wait;
3434} 3617}
3435 3618
3436 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3448 return; 3623 return;
3449 } 3624 }
3450 3625
3451 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3452 3627
3453 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3454 3629
3455 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3456 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460 3632
3461 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3463 $map->alloc; 3635 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3636 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 3637 write_runtime
3466 3638 or warn "ERROR: unable to write runtime file: $!";
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3639 };
3640 }
3477 3641
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3643 $sig->send;
3494 } 3644 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3646 $sig->send;
3497 } 3647 }
3498 3648
3499 $NOW = Event::time;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3651
3510 _post_tick; 3652 _post_tick;
3511 3653};
3512 3654$TICK_WATCHER->priority (EV::MAXPRI);
3513 },
3514);
3515 3655
3516{ 3656{
3517 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3658
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3527 3660 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 3662
3543 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3669
3546 cf::sync_job { 3670 cf::sync_job {
3547 eval { 3671 eval {
3548 BDB::db_env_open 3672 BDB::db_env_open
3549 $DB_ENV, 3673 $DB_ENV,
… …
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3677 0666;
3554 3678
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3680 };
3560 3681
3561 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3683 };
3563 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3564} 3695}
3565 3696
3566{ 3697{
3698 # configure IO::AIO
3699
3567 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 3703}
3580 3704
3581my $_log_backtrace; 3705my $_log_backtrace;
3582 3706
3583sub _log_backtrace { 3707sub _log_backtrace {
… …
3587 3711
3588 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3714 ++$_log_backtrace;
3591 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3592 my @bt = fork_call { 3718 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines