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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.407 by root, Sun Jan 13 09:53:53 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::Syck ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 87our $DB_ENV;
86 88
87our %CFG; 89our %CFG;
88 90
89our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 92our $RUNTIME;
93our $NOW;
91 94
92our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
… …
159 162
160The raw value load value from the last tick. 163The raw value load value from the last tick.
161 164
162=item %cf::CFG 165=item %cf::CFG
163 166
164Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 168from wherever your confdir points to.
166 169
167=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
168 171
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
196 203
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
213)) { 220)) {
214 no strict 'refs'; 221 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 223}
217 224
218$Event::DIED = sub { 225$EV::DIED = sub {
219 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
220}; 227};
221 228
222############################################################################# 229#############################################################################
223 230
… …
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 253 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 254 $d
248 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
249} 256}
250 257
251=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
252 259
253Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
254 261
255=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
256 263
257Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
258 265
259=cut 266=cut
260 267
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 269
263sub to_json ($) { $json_coder->encode ($_[0]) } 270sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 271sub decode_json($) { $json_coder->decode ($_[0]) }
265 272
266=item cf::lock_wait $string 273=item cf::lock_wait $string
267 274
268Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
269 276
… …
334 }; 341 };
335 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
336 $guard 343 $guard
337} 344}
338 345
346=item cf::periodic $interval, $cb
347
348Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer.
350
351=cut
352
353sub periodic($$) {
354 my ($interval, $cb) = @_;
355
356 my $start = rand List::Util::min 180, $interval;
357
358 EV::periodic $start, $interval, 0, $cb
359}
360
339=item cf::get_slot $time[, $priority[, $name]] 361=item cf::get_slot $time[, $priority[, $name]]
340 362
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 363Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds 364This 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. 365of cpu time till the next tick. The slot is only valid till the next cede.
… …
352our @SLOT_QUEUE; 374our @SLOT_QUEUE;
353our $SLOT_QUEUE; 375our $SLOT_QUEUE;
354 376
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 377$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 378$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager");
380
357 my $signal = new Coro::Signal; 381 my $signal = new Coro::Signal;
358 382
359 while () { 383 while () {
360 next_job: 384 next_job:
361 my $avail = cf::till_tick; 385 my $avail = cf::till_tick;
… …
369 } 393 }
370 } 394 }
371 } 395 }
372 396
373 if (@SLOT_QUEUE) { 397 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 398 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 399 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 400 $signal->wait;
377 } else { 401 } else {
378 Coro::schedule; 402 Coro::schedule;
379 } 403 }
… …
402 426
403BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
404 428
405=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
406 430
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 431The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 432is 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 433partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 434acceptable.
411 435
412If it must be done, put the blocking parts into C<sync_job>. This will run 436If 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 437the given BLOCK in another coroutine while waiting for the result. The
… …
418 442
419sub sync_job(&) { 443sub sync_job(&) {
420 my ($job) = @_; 444 my ($job) = @_;
421 445
422 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 447 my $time = EV::time;
424 448
425 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
427 451
452 LOG llevError, Carp::longmess "sync job";#d#
453
428 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 455 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
431 457
432 my $busy = 1; 458 my $busy = 1;
433 my @res; 459 my @res;
434 460
435 (async { 461 (async {
462 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 463 @res = eval { $job->() };
437 warn $@ if $@; 464 warn $@ if $@;
438 undef $busy; 465 undef $busy;
439 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
440 467
441 while ($busy) { 468 while ($busy) {
442 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
443 } 473 }
474 }
444 475
445 $time = Event::time - $time; 476 $time = EV::time - $time;
446 477
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449 480
450 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
… …
480=item fork_call { }, $args 511=item fork_call { }, $args
481 512
482Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
486 517
487=cut 518=cut
488 519
489sub fork_call(&@) { 520sub fork_call(&@) {
490 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
… …
508=item cf::db_put $family => $key => $value 539=item cf::db_put $family => $key => $value
509 540
510Stores the given C<$value> in the family. It can currently store binary 541Stores 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). 542data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 543
544=item $db = cf::db_table "name"
545
546Create and/or open a new database table. The string must not be "db" and must be unique
547within each server.
548
513=cut 549=cut
550
551sub db_table($) {
552 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV;
554
555 eval {
556 $db->set_flags (BDB::CHKSUM);
557
558 utf8::encode $name;
559 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
560 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
561 cf::cleanup "db_open(db): $!" if $!;
562 };
563 cf::cleanup "db_open(db): $@" if $@;
564
565 $db
566}
514 567
515our $DB; 568our $DB;
516 569
517sub db_init { 570sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 571 cf::sync_job {
522 eval { 572 $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 } 573 };
532} 574}
533 575
534sub db_get($$) { 576sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 577 my $key = "$_[0]/$_[1]";
536 578
… …
640attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
642 684
643In the following description, CLASS can be any of C<global>, C<object> 685In 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 686C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 687Deliantra).
646 688
647=over 4 689=over 4
648 690
649=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
650 692
… …
932 } 974 }
933 975
934 0 976 0
935} 977}
936 978
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 980
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 982
941Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
942 984
… …
948 990
949=cut 991=cut
950 992
951############################################################################# 993#############################################################################
952# object support 994# object support
953#
954 995
996sub _object_equal($$);
997sub _object_equal($$) {
998 my ($a, $b) = @_;
999
1000 return 0 unless (ref $a) eq (ref $b);
1001
1002 if ("HASH" eq ref $a) {
1003 my @ka = keys %$a;
1004 my @kb = keys %$b;
1005
1006 return 0 if @ka != @kb;
1007
1008 for (0 .. $#ka) {
1009 return 0 unless $ka[$_] eq $kb[$_];
1010 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1011 }
1012
1013 } elsif ("ARRAY" eq ref $a) {
1014
1015 return 0 if @$a != @$b;
1016
1017 for (0 .. $#$a) {
1018 return 0 unless _object_equal $a->[$_], $b->[$_];
1019 }
1020
1021 } elsif ($a ne $b) {
1022 return 0;
1023 }
1024
1025 1
1026}
1027
1028our $SLOW_MERGES;#d#
955sub _can_merge { 1029sub _can_merge {
956 my ($ob1, $ob2) = @_; 1030 my ($ob1, $ob2) = @_;
957 1031
958 local $Storable::canonical = 1; 1032 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1033
962 $fob1 eq $fob2 1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
963} 1036}
964 1037
965sub reattach { 1038sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1040 my ($obj) = @_;
… …
989cf::attachable->attach ( 1062cf::attachable->attach (
990 prio => -1000000, 1063 prio => -1000000,
991 on_instantiate => sub { 1064 on_instantiate => sub {
992 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
993 1066
994 $data = from_json $data; 1067 $data = decode_json $data;
995 1068
996 for (@$data) { 1069 for (@$data) {
997 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
998 1071
999 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
… …
1013); 1086);
1014 1087
1015sub object_freezer_save { 1088sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1089 my ($filename, $rdata, $objs) = @_;
1017 1090
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1091 sync_job {
1021 if (length $$rdata) { 1092 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1094 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1095 $decname, length $$rdata, scalar @$objs;
1024 1096
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1100 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1101 close $fh;
1030 1102
1031 if (@$objs) { 1103 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1109 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1111 }
… …
1048 } else { 1120 } else {
1049 aio_unlink $filename; 1121 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1122 aio_unlink "$filename.pst";
1051 } 1123 }
1052 }; 1124 };
1053
1054 undef $guard;
1055} 1125}
1056 1126
1057sub object_freezer_as_string { 1127sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1128 my ($rdata, $objs) = @_;
1059 1129
… …
1064 1134
1065sub object_thawer_load { 1135sub object_thawer_load {
1066 my ($filename) = @_; 1136 my ($filename) = @_;
1067 1137
1068 my ($data, $av); 1138 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1139
1072 (aio_load $filename, $data) >= 0 1140 (aio_load $filename, $data) >= 0
1073 or return; 1141 or return;
1074 1142
1075 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1145 or return;
1078 1146
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
1081 } 1149 }
1082 1150
1151 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1153 $decname, length $data, scalar @{$av || []};
1085 1154
1086 ($data, $av) 1155 ($data, $av)
1087} 1156}
1088 1157
1089=head2 COMMAND CALLBACKS 1158=head2 COMMAND CALLBACKS
… …
1277 1346
1278=head3 cf::player 1347=head3 cf::player
1279 1348
1280=over 4 1349=over 4
1281 1350
1351=item cf::player::num_playing
1352
1353Returns the official number of playing players, as per the Crossfire metaserver rules.
1354
1355=cut
1356
1357sub num_playing {
1358 scalar grep
1359 $_->ob->map
1360 && !$_->hidden
1361 && !$_->ob->flag (cf::FLAG_WIZ),
1362 cf::player::list
1363}
1364
1282=item cf::player::find $login 1365=item cf::player::find $login
1283 1366
1284Returns the given player object, loading it if necessary (might block). 1367Returns the given player object, loading it if necessary (might block).
1285 1368
1286=cut 1369=cut
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1407 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1408
1326 my $f = new_from_file cf::object::thawer path $login 1409 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1410 or return;
1328 1411
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1412 my $pl = cf::player::load_pl $f
1331 or return; 1413 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1414 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1415 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1416 $cf::PLAYER{$login} = $pl
… …
1486 1568
1487Expand crossfire pod fragments into protocol xml. 1569Expand crossfire pod fragments into protocol xml.
1488 1570
1489=cut 1571=cut
1490 1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1491sub expand_cfpod { 1584sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1585 my ($self, $pod) = @_;
1493 1586
1494 # escape & and < 1587 my $xml;
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1588
1498 # this is buggy, it needs to properly take care of nested <'s 1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1499 1592
1500 1 while 1593 $group =~ s/&/&amp;/g;
1501 # replace B<>, I<>, U<> etc. 1594 $group =~ s/</&lt;/g;
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1595
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1596 $xml .= $group;
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1597 } elsif ($pod =~ m%\G
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1598 ([BCGHITU])
1506 # replace G<male|female> tags 1599 <
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1600 (?:
1508 $self->gender ? $2 : $1 1601 ([^<>]*) (?{ $group = $^N })
1509 }ge 1602 | < $interior >
1510 # replace H<hint text> 1603 )
1511 || s{H<([^\>]*)>} 1604 >
1605 %gcsx
1512 { 1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1626 "")
1516 [$self->{hintmode}] 1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1517 }ge; 1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1518 1638
1639 for ($xml) {
1519 # create single paragraphs (very hackish) 1640 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g; 1641 s/(?<=\S)\n(?=\w)/ /g;
1521 1642
1522 # compress some whitespace 1643 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends 1644 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines 1645 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines 1646 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines 1647 s/\n+$//; # ending lines
1648 }
1527 1649
1528 $_ 1650 $xml
1529} 1651}
1652
1653no re 'eval';
1530 1654
1531sub hintmode { 1655sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1657 $_[0]{hintmode}
1534} 1658}
… …
1891 2015
1892 { 2016 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2017 my $guard = cf::lock_acquire "map_data:$path";
1894 2018
1895 return unless $self->valid; 2019 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2020 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2021
1898 $self->in_memory (cf::MAP_LOADING); 2022 $self->in_memory (cf::MAP_LOADING);
1899 2023
1900 $self->alloc; 2024 $self->alloc;
1901 2025
… …
2015 } 2139 }
2016 2140
2017 $MAP_PREFETCH{$path} |= $load; 2141 $MAP_PREFETCH{$path} |= $load;
2018 2142
2019 $MAP_PREFETCHER ||= cf::async { 2143 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher";
2145
2020 while (%MAP_PREFETCH) { 2146 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2147 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2148 if (my $map = find $k) {
2023 $map->load if $v; 2149 $map->load if $v;
2024 } 2150 }
… …
2050 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2051 2177
2052 local $self->{last_access} = $self->last_access;#d# 2178 local $self->{last_access} = $self->last_access;#d#
2053 2179
2054 cf::async { 2180 cf::async {
2181 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2182 $_->contr->save for $self->players;
2056 }; 2183 };
2057 2184
2058 if ($uniq) { 2185 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2073 2200
2074 return if $self->players; 2201 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2076 return if $self->{deny_save}; 2203 return if $self->{deny_save};
2077 2204
2205 $self->in_memory (cf::MAP_SWAPPED);
2206
2078 $self->deactivate; 2207 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2209 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2210}
2082 2211
2083sub reset_at { 2212sub reset_at {
2084 my ($self) = @_; 2213 my ($self) = @_;
2085 2214
… …
2118 } 2247 }
2119 2248
2120 delete $cf::MAP{$self->path}; 2249 delete $cf::MAP{$self->path};
2121 2250
2122 $self->deactivate; 2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2253 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2254
2127 $self->unlink_save; 2255 $self->unlink_save;
2128 $self->destroy; 2256 $self->destroy;
2129} 2257}
2130 2258
… …
2245=cut 2373=cut
2246 2374
2247sub deref { 2375sub deref {
2248 my ($ref) = @_; 2376 my ($ref) = @_;
2249 2377
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2378 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2379 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2380 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2381 or return;
2257 $pl->ob->uuid eq $uuid 2382 $pl->ob->uuid eq $uuid
2258 or return; 2383 or return;
… …
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2555
2431 $self->enter_link; 2556 $self->enter_link;
2432 2557
2433 (async { 2558 (async {
2559 $Coro::current->{desc} = "player::goto $path $x $y";
2560
2561 # *tag paths override both path and x|y
2562 if ($path =~ /^\*(.*)$/) {
2563 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2564 my $ob = $obs[rand @obs];
2565
2566 # see if we actually can go there
2567 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2568 $ob = $obs[rand @obs];
2569 } else {
2570 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2571 }
2572 # else put us there anyways for now #d#
2573
2574 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2575 } else {
2576 ($path, $x, $y) = (undef, undef, undef);
2577 }
2578 }
2579
2434 my $map = eval { 2580 my $map = eval {
2435 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
2436 2582
2437 if ($map) { 2583 if ($map) {
2438 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
2440 } else { 2586 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2588 }
2443 2589
2444 $map 2590 $map
2445 }; 2591 };
2446 2592
… …
2499 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2500 } 2646 }
2501 2647
2502 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2503 2649
2504 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2505 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2506 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2507 2653
2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2509 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
… …
2536 # if exit is damned, update players death & WoR home-position 2682 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp) 2683 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED); 2684 if $exit->flag (FLAG_DAMNED);
2539 2685
2540 (async { 2686 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2688
2541 $self->deactivate_recursive; # just to be sure 2689 $self->deactivate_recursive; # just to be sure
2542 unless (eval { 2690 unless (eval {
2543 $self->goto ($slaying, $hp, $sp); 2691 $self->goto ($slaying, $hp, $sp);
2544 2692
2545 1; 2693 1;
… …
2580the message, with C<log> being the default. If C<$color> is negative, suppress 2728the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 2729the message unless the client supports the msg packet.
2582 2730
2583=cut 2731=cut
2584 2732
2733# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 2734our %CHANNEL = (
2586 "c/identify" => { 2735 "c/identify" => {
2587 id => "identify", 2736 id => "infobox",
2588 title => "Identify", 2737 title => "Identify",
2589 reply => undef, 2738 reply => undef,
2590 tooltip => "Items recently identified", 2739 tooltip => "Items recently identified",
2591 }, 2740 },
2592 "c/examine" => { 2741 "c/examine" => {
2593 id => "examine", 2742 id => "infobox",
2594 title => "Examine", 2743 title => "Examine",
2595 reply => undef, 2744 reply => undef,
2596 tooltip => "Signs and other items you examined", 2745 tooltip => "Signs and other items you examined",
2597 }, 2746 },
2747 "c/book" => {
2748 id => "infobox",
2749 title => "Book",
2750 reply => undef,
2751 tooltip => "The contents of a note or book",
2752 },
2753 "c/lookat" => {
2754 id => "infobox",
2755 title => "Look",
2756 reply => undef,
2757 tooltip => "What you saw there",
2758 },
2759 "c/who" => {
2760 id => "infobox",
2761 title => "Players",
2762 reply => undef,
2763 tooltip => "Shows players who are currently online",
2764 },
2765 "c/body" => {
2766 id => "infobox",
2767 title => "Body Parts",
2768 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available",
2770 },
2771 "c/uptime" => {
2772 id => "infobox",
2773 title => "Uptime",
2774 reply => undef,
2775 tooltip => "How long the server has been running since last restart",
2776 },
2777 "c/mapinfo" => {
2778 id => "infobox",
2779 title => "Map Info",
2780 reply => undef,
2781 tooltip => "Information related to the maps",
2782 },
2598); 2783);
2599 2784
2600sub cf::client::send_msg { 2785sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
2602 2787
2603 $msg = $self->pl->expand_cfpod ($msg); 2788 $msg = $self->pl->expand_cfpod ($msg);
2604 2789
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 2790 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 2791
2607 # check predefined channels, for the benefit of C 2792 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2793 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel};
2609 2795
2796 $self->ext_msg (channel_info => $channel)
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id};
2800
2610 if (ref $channel) { 2801 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 2802 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 2803 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 2804 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 2805 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg; 2806 if $self->can_msg;
… …
2832=pod 3023=pod
2833 3024
2834The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2835 3026
2836 cf::object 3027 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3028 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3029 insert remove name archname title slaying race decrease_ob_nr
2839 3030
2840 cf::object::player 3031 cf::object::player
2841 player 3032 player
2842 3033
… …
2849=cut 3040=cut
2850 3041
2851for ( 3042for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3044 insert remove inv name archname title slaying race
2854 decrease_ob_nr)], 3045 decrease_ob_nr destroy)],
2855 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2857 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2858) { 3049) {
2859 no strict 'refs'; 3050 no strict 'refs';
… …
2964 { 3155 {
2965 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
2966 3157
2967 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
2968 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
2969 cf::face::set_visibility $idx, $info->{visibility}; 3161 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap}; 3162 cf::face::set_magicmap $idx, $info->{magicmap};
2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2973 3165
2974 cf::cede_to_tick; 3166 cf::cede_to_tick;
2975 } 3167 }
2976 3168
2977 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
2978 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
2979 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
2980 or next; 3173 or next;
3174
2981 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth; 3176 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else { 3178 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3003 { 3197 {
3004 # TODO: for gcfclient pleasure, we should give resources 3198 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index. 3199 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource}; 3200 my $res = $facedata->{resource};
3007 3201
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) { 3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data; 3205 my $data;
3013 3206
3014 if ($info->{type} & 1) { 3207 if ($info->{type} & 1) {
3015 # prepend meta info 3208 # prepend meta info
3016 3209
3017 my $meta = $enc->encode ({ 3210 my $meta = $enc->encode ({
3018 name => $name, 3211 name => $name,
3019 %{ $info->{meta} || {} }, 3212 %{ $info->{meta} || {} },
3020 }); 3213 });
3021 3214
3022 $data = pack "(w/a*)*", $meta, $info->{data}; 3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type};
3023 } else { 3222 } else {
3024 $data = $info->{data}; 3223 $RESOURCE{$name} = $info;
3025 } 3224 }
3026 3225
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick; 3226 cf::cede_to_tick;
3031 } 3227 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 } 3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3051 3231
3052 1 3232 1
3053} 3233}
3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3054 3254
3055register_exticmd fx_want => sub { 3255register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_; 3256 my ($ns, $want) = @_;
3057 3257
3058 while (my ($k, $v) = each %$want) { 3258 while (my ($k, $v) = each %$want) {
… …
3134sub main { 3334sub main {
3135 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3338 (async {
3139 Event::one_event; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
3141 }; 3342 };
3142 3343
3143 reload_config; 3344 reload_config;
3144 db_init; 3345 db_init;
3145 load_extensions; 3346 load_extensions;
3146 3347
3147 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3148 Event::loop; 3350 EV::loop;
3149} 3351}
3150 3352
3151############################################################################# 3353#############################################################################
3152# initialisation and cleanup 3354# initialisation and cleanup
3153 3355
3154# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
3155BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
3164 },
3165 ); 3362 };
3166 } 3363 }
3167} 3364}
3168 3365
3169sub write_runtime { 3366sub write_runtime {
3170 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
… …
3215 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
3217 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3418 $pl->save;
3221 } 3419 }
3222 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
3223 3421
3224 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
… …
3263 warn "syncing database to disk"; 3461 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
3265 3463
3266 # if anything goes wrong in here, we should simply crash as we already saved 3464 # if anything goes wrong in here, we should simply crash as we already saved
3267 3465
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
3274 for (;;) { 3467 for (;;) {
3275 BDB::flush; 3468 BDB::flush;
3276 IO::AIO::flush; 3469 IO::AIO::flush;
3277 Coro::cede; 3470 Coro::cede_notself;
3278 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
3279 warn "iterate..."; 3472 warn "iterate...";
3280 } 3473 }
3281 3474
3282 ++$RELOAD; 3475 ++$RELOAD;
… …
3371 3564
3372sub reload_perl() { 3565sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3375 3568
3376 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3377 reentrant => 0,
3378 after => 0,
3379 data => WF_AUTOCANCEL,
3380 cb => sub {
3381 do_reload_perl;
3382 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3383 }, 3571 do_reload_perl;
3384 ); 3572 };
3385} 3573}
3386 3574
3387register_command "reload" => sub { 3575register_command "reload" => sub {
3388 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3389 3577
3390 if ($who->flag (FLAG_WIZ)) { 3578 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 3579 $who->message ("reloading server.");
3580 async {
3581 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 3582 reload_perl;
3583 };
3393 } 3584 }
3394}; 3585};
3395 3586
3396unshift @INC, $LIBDIR; 3587unshift @INC, $LIBDIR;
3397 3588
… …
3416 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3609 $signal->wait;
3419} 3610}
3420 3611
3421 my $min = 1e6;#d# 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3433 return; 3616 return;
3434 } 3617 }
3435 3618
3436 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3437 3620
3438 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3439 3622
3440 0 && sync_job {#d# 3623 $RUNTIME += $TICK;
3441 for(1..10) { 3624 $NEXT_TICK = $_[0]->at;
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445 3625
3446 $map->width (50); 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3447 $map->height (50); 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3448 $map->alloc; 3628 Coro::async_pool {
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3629 $Coro::current->{desc} = "runtime saver";
3450 my $t = Event::time - $t; 3630 write_runtime
3451 3631 or warn "ERROR: unable to write runtime file: $!";
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 3632 };
3633 }
3462 3634
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3636 $sig->send;
3479 } 3637 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3639 $sig->send;
3482 } 3640 }
3483 3641
3484 $NOW = Event::time;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3644
3495 _post_tick; 3645 _post_tick;
3496 3646};
3497 3647$TICK_WATCHER->priority (EV::MAXPRI);
3498 },
3499);
3500 3648
3501{ 3649{
3502 BDB::max_poll_time $TICK * 0.1; 3650 # configure BDB
3503 $BDB_POLL_WATCHER = Event->io ( 3651
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3512 3653 BDB::max_poll_reqs $TICK * 0.1;
3513 BDB::set_sync_prepare { 3654 $Coro::BDB::WATCHER->priority (1);
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527 3655
3528 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3659 | BDB::LOG_AUTOREMOVE, 1);
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 3662
3531 cf::sync_job { 3663 cf::sync_job {
3532 eval { 3664 eval {
3533 BDB::db_env_open 3665 BDB::db_env_open
3534 $DB_ENV, 3666 $DB_ENV,
… …
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3668 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3669 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 3670 0666;
3539 3671
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3672 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 3673 };
3545 3674
3546 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 3676 };
3548 } 3677 }
3678
3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3680 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3681 };
3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3684 };
3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3687 };
3549} 3688}
3550 3689
3551{ 3690{
3691 # configure IO::AIO
3692
3552 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 3696}
3565 3697
3566my $_log_backtrace; 3698my $_log_backtrace;
3567 3699
3568sub _log_backtrace { 3700sub _log_backtrace {
… …
3572 3704
3573 # limit the # of concurrent backtraces 3705 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 3706 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace; 3707 ++$_log_backtrace;
3576 async { 3708 async {
3709 $Coro::current->{desc} = "abt $msg";
3710
3577 my @bt = fork_call { 3711 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 3712 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3713 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3714 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 3715 or die "addr2line: $!";

Diff Legend

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