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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 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
… …
1240 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1242 1318
1243 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1320 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1322 }
1248 1323
1249 warn $msg; 1324 warn $msg;
1250 } 1325 }
1251 1326
… …
1276use Coro::AIO; 1351use Coro::AIO;
1277 1352
1278=head3 cf::player 1353=head3 cf::player
1279 1354
1280=over 4 1355=over 4
1356
1357=item cf::player::num_playing
1358
1359Returns the official number of playing players, as per the Crossfire metaserver rules.
1360
1361=cut
1362
1363sub num_playing {
1364 scalar grep
1365 $_->ob->map
1366 && !$_->hidden
1367 && !$_->ob->flag (cf::FLAG_WIZ),
1368 cf::player::list
1369}
1281 1370
1282=item cf::player::find $login 1371=item cf::player::find $login
1283 1372
1284Returns the given player object, loading it if necessary (might block). 1373Returns the given player object, loading it if necessary (might block).
1285 1374
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1414
1326 my $f = new_from_file cf::object::thawer path $login 1415 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1416 or return;
1328 1417
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1418 my $pl = cf::player::load_pl $f
1331 or return; 1419 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1420 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1421 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
… …
1486 1574
1487Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1488 1576
1489=cut 1577=cut
1490 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1491sub expand_cfpod { 1590sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1493 1592
1494 # escape & and < 1593 my $xml;
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1594
1498 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1499 1598
1500 1 while 1599 $group =~ s/&/&amp;/g;
1501 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1506 # replace G<male|female> tags 1605 <
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1508 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1509 }ge 1608 | < $interior >
1510 # replace H<hint text> 1609 )
1511 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1512 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1632 "")
1516 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1517 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1518 1644
1645 for ($xml) {
1519 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1521 1648
1522 # compress some whitespace 1649 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1527 1655
1528 $_ 1656 $xml
1529} 1657}
1658
1659no re 'eval';
1530 1660
1531sub hintmode { 1661sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1663 $_[0]{hintmode}
1534} 1664}
… …
1891 2021
1892 { 2022 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2023 my $guard = cf::lock_acquire "map_data:$path";
1894 2024
1895 return unless $self->valid; 2025 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2026 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2027
1898 $self->in_memory (cf::MAP_LOADING); 2028 $self->in_memory (cf::MAP_LOADING);
1899 2029
1900 $self->alloc; 2030 $self->alloc;
1901 2031
… …
2015 } 2145 }
2016 2146
2017 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2018 2148
2019 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2020 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2154 if (my $map = find $k) {
2023 $map->load if $v; 2155 $map->load if $v;
2024 } 2156 }
… …
2050 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2051 2183
2052 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2053 2185
2054 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2056 }; 2189 };
2057 2190
2058 if ($uniq) { 2191 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2246=cut 2379=cut
2247 2380
2248sub deref { 2381sub deref {
2249 my ($ref) = @_; 2382 my ($ref) = @_;
2250 2383
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2385 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2387 or return;
2258 $pl->ob->uuid eq $uuid 2388 $pl->ob->uuid eq $uuid
2259 or return; 2389 or return;
… …
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2561
2432 $self->enter_link; 2562 $self->enter_link;
2433 2563
2434 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2567 # *tag paths override both path and x|y
2568 if ($path =~ /^\*(.*)$/) {
2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2570 my $ob = $obs[rand @obs];
2571
2572 # see if we actually can go there
2573 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2574 $ob = $obs[rand @obs];
2575 } else {
2576 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2577 }
2578 # else put us there anyways for now #d#
2579
2580 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2581 } else {
2582 ($path, $x, $y) = (undef, undef, undef);
2583 }
2584 }
2585
2435 my $map = eval { 2586 my $map = eval {
2436 my $map = cf::map::find $path; 2587 my $map = defined $path ? cf::map::find $path : undef;
2437 2588
2438 if ($map) { 2589 if ($map) {
2439 $map = $map->customise_for ($self); 2590 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2591 $map = $check->($map) if $check && $map;
2441 } else { 2592 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2594 }
2444 2595
2445 $map 2596 $map
2446 }; 2597 };
2447 2598
… …
2500 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2501 } 2652 }
2502 2653
2503 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2504 2655
2505 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2506 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2508 2659
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2537 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2540 2691
2541 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2542 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2543 unless (eval { 2696 unless (eval {
2544 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2545 2698
2546 1; 2699 1;
… …
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2583 2736
2584=cut 2737=cut
2585 2738
2739# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2740our %CHANNEL = (
2587 "c/identify" => { 2741 "c/identify" => {
2588 id => "identify", 2742 id => "infobox",
2589 title => "Identify", 2743 title => "Identify",
2590 reply => undef, 2744 reply => undef,
2591 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2592 }, 2746 },
2593 "c/examine" => { 2747 "c/examine" => {
2594 id => "examine", 2748 id => "infobox",
2595 title => "Examine", 2749 title => "Examine",
2596 reply => undef, 2750 reply => undef,
2597 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2598 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2599); 2789);
2600 2790
2601sub cf::client::send_msg { 2791sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2793
2604 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2605 2795
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2797
2608 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2610 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2611 if (ref $channel) { 2807 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2812 if $self->can_msg;
… …
2833=pod 3029=pod
2834 3030
2835The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2836 3032
2837 cf::object 3033 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2840 3036
2841 cf::object::player 3037 cf::object::player
2842 player 3038 player
2843 3039
… …
2850=cut 3046=cut
2851 3047
2852for ( 3048for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2855 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2856 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2858 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2859) { 3055) {
2860 no strict 'refs'; 3056 no strict 'refs';
… …
2965 { 3161 {
2966 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
2967 3163
2968 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
2970 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2974 3171
2975 cf::cede_to_tick; 3172 cf::cede_to_tick;
2976 } 3173 }
2977 3174
2978 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
2980 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
2981 or next; 3179 or next;
3180
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3184 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3004 { 3203 {
3005 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3008 3207
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data; 3211 my $data;
3014 3212
3015 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3016 # prepend meta info 3214 # prepend meta info
3017 3215
3018 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3019 name => $name, 3217 name => $name,
3020 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3021 }); 3219 });
3022 3220
3023 $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3024 } else { 3228 } else {
3025 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3026 } 3230 }
3027 3231
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick; 3232 cf::cede_to_tick;
3032 } 3233 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3237
3053 1 3238 1
3054} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3055 3260
3056register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3058 3263
3059 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3114sub reload_config { 3319sub reload_config {
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3116 or return; 3321 or return;
3117 3322
3118 local $/; 3323 local $/;
3119 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3120 3325
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3122 3327
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3124 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3135sub main { 3340sub main {
3136 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3344 (async {
3140 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3142 }; 3348 };
3143 3349
3144 reload_config; 3350 reload_config;
3145 db_init; 3351 db_init;
3146 load_extensions; 3352 load_extensions;
3147 3353
3148 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3149 Event::loop; 3356 EV::loop;
3150} 3357}
3151 3358
3152############################################################################# 3359#############################################################################
3153# initialisation and cleanup 3360# initialisation and cleanup
3154 3361
3155# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3156BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3159 reentrant => 0,
3160 data => WF_AUTOCANCEL,
3161 signal => $signal,
3162 prio => 0,
3163 cb => sub {
3164 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3165 },
3166 ); 3368 };
3167 } 3369 }
3168} 3370}
3169 3371
3170sub write_runtime { 3372sub write_runtime {
3171 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3216 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3218 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3424 $pl->save;
3222 } 3425 }
3223 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3224 3427
3225 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3264 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3266 3469
3267 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3268 3471
3269 warn "cancelling all WF_AUTOCANCEL watchers";
3270 for (Event::all_watchers) {
3271 $_->cancel if $_->data & WF_AUTOCANCEL;
3272 }
3273
3274 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3275 for (;;) { 3473 for (;;) {
3276 BDB::flush; 3474 BDB::flush;
3277 IO::AIO::flush; 3475 IO::AIO::flush;
3278 Coro::cede; 3476 Coro::cede_notself;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3280 warn "iterate..."; 3478 warn "iterate...";
3281 } 3479 }
3282 3480
3283 ++$RELOAD; 3481 ++$RELOAD;
… …
3359 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3360 3558
3361 1 3559 1
3362 } or do { 3560 } or do {
3363 warn $@; 3561 warn $@;
3364 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3365 exit 1;
3366 }; 3563 };
3367 3564
3368 warn "reloaded"; 3565 warn "reloaded";
3369}; 3566};
3370 3567
… …
3372 3569
3373sub reload_perl() { 3570sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3376 3573
3377 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3378 reentrant => 0,
3379 after => 0,
3380 data => WF_AUTOCANCEL,
3381 cb => sub {
3382 do_reload_perl; 3575 do_reload_perl;
3383 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3384 },
3385 ); 3577 };
3386} 3578}
3387 3579
3388register_command "reload" => sub { 3580register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3390 3582
3391 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3587 reload_perl;
3588 };
3394 } 3589 }
3395}; 3590};
3396 3591
3397unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3398 3593
… …
3417 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3614 $signal->wait;
3420} 3615}
3421 3616
3422 my $min = 1e6;#d# 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer (
3425 reentrant => 0,
3426 parked => 1,
3427 prio => 0,
3428 at => $NEXT_TICK || $TICK,
3429 data => WF_AUTOCANCEL,
3430 cb => sub {
3431 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3434 return; 3621 return;
3435 } 3622 }
3436 3623
3437 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3438 3625
3439 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3440 3627
3441 0 && sync_job {#d# 3628 $RUNTIME += $TICK;
3442 for(1..10) { 3629 $NEXT_TICK = $_[0]->at;
3443 my $t = Event::time;
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3445 or die;
3446 3630
3447 $map->width (50); 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3448 $map->height (50); 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3449 $map->alloc; 3633 Coro::async_pool {
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3634 $Coro::current->{desc} = "runtime saver";
3451 my $t = Event::time - $t; 3635 write_runtime
3452 3636 or warn "ERROR: unable to write runtime file: $!";
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 }; 3637 };
3638 }
3463 3639
3464 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK;
3466
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool {
3470 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!";
3472 };
3473 }
3474
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3641 $sig->send;
3480 } 3642 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3644 $sig->send;
3483 } 3645 }
3484 3646
3485 $NOW = Event::time;
3486
3487 # if we are delayed by four ticks or more, skip them all
3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3489
3490 $TICK_WATCHER->at ($NEXT_TICK);
3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3649
3496 _post_tick; 3650 _post_tick;
3497 3651};
3498 3652$TICK_WATCHER->priority (EV::MAXPRI);
3499 },
3500);
3501 3653
3502{ 3654{
3503 BDB::max_poll_time $TICK * 0.1; 3655 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 3656
3505 reentrant => 0,
3506 fd => BDB::poll_fileno,
3507 poll => 'r',
3508 prio => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb,
3511 );
3512 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3513 3658 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 3659 $Coro::BDB::WATCHER->priority (1);
3515 my $status;
3516 my $current = $Coro::current;
3517 (
3518 sub {
3519 $status = $!;
3520 $current->ready; undef $current;
3521 },
3522 sub {
3523 Coro::schedule while defined $current;
3524 $! = $status;
3525 },
3526 )
3527 };
3528 3660
3529 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3664 | BDB::LOG_AUTOREMOVE, 1);
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3667
3532 cf::sync_job { 3668 cf::sync_job {
3533 eval { 3669 eval {
3534 BDB::db_env_open 3670 BDB::db_env_open
3535 $DB_ENV, 3671 $DB_ENV,
… …
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3673 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3674 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3675 0666;
3540 3676
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3677 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 3678 };
3546 3679
3547 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3681 };
3549 } 3682 }
3683
3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3686 };
3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3689 };
3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3692 };
3550} 3693}
3551 3694
3552{ 3695{
3696 # configure IO::AIO
3697
3553 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3558 reentrant => 0,
3559 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno,
3561 poll => 'r',
3562 prio => 6,
3563 cb => \&IO::AIO::poll_cb,
3564 );
3565} 3701}
3566 3702
3567my $_log_backtrace; 3703my $_log_backtrace;
3568 3704
3569sub _log_backtrace { 3705sub _log_backtrace {
… …
3573 3709
3574 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3712 ++$_log_backtrace;
3577 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3578 my @bt = fork_call { 3716 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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