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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
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::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
158 162
159The raw value load value from the last tick. 163The raw value load value from the last tick.
160 164
161=item %cf::CFG 165=item %cf::CFG
162 166
163Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 168from wherever your confdir points to.
165 169
166=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
167 171
168These 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
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
332 346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
337our @SLOT_QUEUE; 354our @SLOT_QUEUE;
338our $SLOT_QUEUE; 355our $SLOT_QUEUE;
339 356
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
342 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
343 362
344 while () { 363 while () {
345 next_job: 364 next_job:
346 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
354 } 373 }
355 } 374 }
356 } 375 }
357 376
358 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 380 $signal->wait;
362 } else { 381 } else {
363 Coro::schedule; 382 Coro::schedule;
364 } 383 }
365 } 384 }
366}; 385};
367 386
368sub get_slot($;$) { 387sub get_slot($;$$) {
369 my ($time, $pri) = @_; 388 my ($time, $pri, $name) = @_;
370 389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 395 $SLOT_QUEUE->ready;
374 $sig->wait; 396 $sig->wait;
375} 397}
376 398
384 406
385BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
386 408
387=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
388 410
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 412is always able to handle events or runnable, as Deliantra is only
391partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
392acceptable. 414acceptable.
393 415
394If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
395the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
405 my $time = Event::time; 427 my $time = Event::time;
406 428
407 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
409 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
410 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
411 # (but this is cancel-safe) 435 # (but this is cancel-safe)
412 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
413 437
414 my $busy = 1; 438 my $busy = 1;
415 my @res; 439 my @res;
416 440
417 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 443 @res = eval { $job->() };
419 warn $@ if $@; 444 warn $@ if $@;
420 undef $busy; 445 undef $busy;
421 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
422 447
423 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
424 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
425 } 454 }
426 455
427 $time = Event::time - $time; 456 $time = Event::time - $time;
428 457
429 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
466Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
468 497
469=cut 498=cut
470 499
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 500sub fork_call(&@) {
481 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
482 502
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 506
488 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 508 reset_signals;
502 local $SIG{__WARN__}; 509 &$cb
503 local $SIG{__DIE__}; 510 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 511
510 eval { 512 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 513}
523 514
524=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
525 516
526Returns a single value from the environment database. 517Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
529 520
530Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
533=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
534 547
535our $DB; 548our $DB;
536 549
537sub db_init { 550sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 551 cf::sync_job {
542 eval { 552 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 553 };
552} 554}
553 555
554sub db_get($$) { 556sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
556 558
606 if (1) { 608 if (1) {
607 $md5 = 609 $md5 =
608 join "\x00", 610 join "\x00",
609 $processversion, 611 $processversion,
610 map { 612 map {
611 Coro::cede; 613 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 615 } 0.. $#$src;
614 616
615 617
616 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
660attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
662 664
663In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
664C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
665Crossfire TRT). 667Deliantra).
666 668
667=over 4 669=over 4
668 670
669=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
670 672
968 970
969=cut 971=cut
970 972
971############################################################################# 973#############################################################################
972# object support 974# object support
973#
974 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
975sub _can_merge { 1009sub _can_merge {
976 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
977 1011
978 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1013
982 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
983} 1016}
984 1017
985sub reattach { 1018sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1020 my ($obj) = @_;
1035sub object_freezer_save { 1068sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1037 1070
1038 sync_job { 1071 sync_job {
1039 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1042 1076
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1081 close $fh;
1048 1082
1049 if (@$objs) { 1083 if (@$objs) {
1050 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1089 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1091 }
1065 } 1099 }
1066 } else { 1100 } else {
1067 aio_unlink $filename; 1101 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1069 } 1103 }
1070 } 1104 };
1071} 1105}
1072 1106
1073sub object_freezer_as_string { 1107sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1075 1109
1087 or return; 1121 or return;
1088 1122
1089 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1125 or return;
1126
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1093 } 1129 }
1094 1130
1131 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1097 return ($data, $av); 1135 ($data, $av)
1098} 1136}
1099 1137
1100=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1101 1139
1102=over 4 1140=over 4
1175 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1176 1214
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1216
1179 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1185 } else { 1232 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1234 }
1188 1235
1189 cf::override; 1236 cf::override;
1279 1326
1280=head3 cf::player 1327=head3 cf::player
1281 1328
1282=over 4 1329=over 4
1283 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1284=item cf::player::find $login 1345=item cf::player::find $login
1285 1346
1286Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1287 1348
1288=cut 1349=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1388
1328 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1331 } 1397 }
1332 } 1398 }
1333} 1399}
1334 1400
1344 1410
1345 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1347 1413
1348 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1349 Coro::cede; 1415 cf::cede_to_tick;
1350} 1416}
1351 1417
1352sub new($) { 1418sub new($) {
1353 my ($login) = @_; 1419 my ($login) = @_;
1354 1420
1358 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1359 1425
1360 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1361 1427
1362 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1363} 1439}
1364 1440
1365=item $pl->quit_character 1441=item $pl->quit_character
1366 1442
1367Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1498 or return [];
1423 1499
1424 my @logins; 1500 my @logins;
1425 1501
1426 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1430 1511
1431 utf8::decode $login; 1512 utf8::decode $login;
1432 push @logins, $login; 1513 push @logins, $login;
1433 } 1514 }
1434 1515
1467 1548
1468Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1469 1550
1470=cut 1551=cut
1471 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1472sub expand_cfpod { 1564sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1474 1566
1475 # escape & and < 1567 my $xml;
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478 1568
1479 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1480 1572
1481 1 while 1573 $group =~ s/&/&amp;/g;
1482 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1486 # replace G<male|female> tags 1578 ([BCGHITU])
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1488 $self->gender ? $2 : $1 1580 (?:
1489 }ge 1581 ([^<>]*) (?{ $group = $^N })
1490 # replace H<hint text> 1582 | < $interior >
1491 || s{H<([^\>]*)>} 1583 )
1584 >
1585 %gcsx
1492 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "") 1606 "")
1496 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1497 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1498 1618
1619 for ($xml) {
1499 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1501 1622
1502 # compress some whitespace 1623 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1507 1629
1508 $_ 1630 $xml
1509} 1631}
1632
1633no re 'eval';
1510 1634
1511sub hintmode { 1635sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1637 $_[0]{hintmode}
1514} 1638}
1515 1639
1516=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1517 1641
1518Sends an ext reply to the player. 1642Sends an ext reply to the player.
1519 1643
1520=cut 1644=cut
1521 1645
1522sub ext_reply($$%) { 1646sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1524 1648
1525 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1650}
1528 1651
1529=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1530 1653
1531Sends an ext event to the client. 1654Sends an ext event to the client.
1532 1655
1533=cut 1656=cut
1534 1657
1535sub ext_event($$%) { 1658sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1537 1660
1538 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1539} 1662}
1540 1663
1541=head3 cf::region 1664=head3 cf::region
1542 1665
1543=over 4 1666=over 4
1759 1882
1760sub load_header_from($) { 1883sub load_header_from($) {
1761 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1762 1885
1763 utf8::encode $path; 1886 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1769 1895
1770 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1771 1897
1772 1 1898 1
1773} 1899}
1827sub find { 1953sub find {
1828 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1829 1955
1830 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1831 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1833 1960
1834 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1836 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1837 or return; 1966 or return;
1838 1967
1839 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1840 1969
1842 or return; 1971 or return;
1843 1972
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1847 $map->reset; 1978 $map->reset;
1848 undef $guard;
1849 return find $path; 1979 return find $path;
1850 } 1980 }
1851 1981
1852 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1853 } 1983 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1863 1993
1864 my $path = $self->{path}; 1994 my $path = $self->{path};
1865 1995
1866 { 1996 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1868 1998
1999 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2001
1871 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1872 2003
1873 $self->alloc; 2004 $self->alloc;
1874 2005
1875 $self->pre_load; 2006 $self->pre_load;
1876 Coro::cede; 2007 cf::cede_to_tick;
1877 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1879 or return; 2012 or return;
1880 2013
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1883 2016
1884 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2018 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2021 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1889 } 2025 }
1890 } 2026 }
1891 2027
1892 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1893 # now do the right thing for maps 2031 # now do the right thing for maps
1894 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2034 unless $self->difficulty;
1897 Coro::cede; 2035 cf::cede_to_tick;
1898 2036
1899 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2038 $self->decay_objects;
1901 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1902 $self->update_buttons; 2040 $self->update_buttons;
1903 Coro::cede; 2041 cf::cede_to_tick;
1904 $self->set_darkness_map; 2042 $self->set_darkness_map;
1905 Coro::cede; 2043 cf::cede_to_tick;
1906 $self->activate; 2044 $self->activate;
1907 } 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
1908 2049
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2050 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 2051 }
1911 2052
1912 $self->post_load; 2053 $self->post_load;
1923 2064
1924 $self 2065 $self
1925} 2066}
1926 2067
1927# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2069sub load_neighbours {
1929 my ($map) = @_; 2070 my ($map) = @_;
1930 2071
1931 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1932 2073
1933 for (0 .. 3) { 2074 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1935 or next; 2076 or next;
1936 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1937 or next; 2078 or next;
1938 $neigh->load; 2079 $neigh->load;
1939 2080
2081 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2084 }
1943 2085
1944 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1946 or next; 2089 or next;
1947 $neigh->load; 2090 $neigh->load;
1948 } 2091 }
1949} 2092}
1950 2093
1955} 2098}
1956 2099
1957sub do_load_sync { 2100sub do_load_sync {
1958 my ($map) = @_; 2101 my ($map) = @_;
1959 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1960 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1961} 2107}
1962 2108
1963our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1965 2111
1966sub find_async { 2112sub find_async {
1967 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1968 2114
1969 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1970 2116
1971 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2119 }
1974 2120
1975 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1976 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1977 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2128 if (my $map = find $k) {
1980 $map->load; 2129 $map->load if $v;
1981 } 2130 }
1982 2131
1983 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1984 } 2133 }
1985 } 2134 }
1986 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1987 }; 2136 };
1988 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1991} 2140}
1992 2141
1993sub save { 2142sub save {
1994 my ($self) = @_; 2143 my ($self) = @_;
1995 2144
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2146
1998 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1999 2148
2000 return unless $self->dirty; 2149 return unless $self->dirty;
2001 2150
2007 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2008 2157
2009 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2010 2159
2011 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2013 }; 2163 };
2014 2164
2015 if ($uniq) { 2165 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2174 my ($self) = @_;
2025 2175
2026 # save first because save cedes 2176 # save first because save cedes
2027 $self->save; 2177 $self->save;
2028 2178
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2180
2031 return if $self->players; 2181 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2034 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2189 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2190}
2038 2191
2039sub reset_at { 2192sub reset_at {
2040 my ($self) = @_; 2193 my ($self) = @_;
2041 2194
2073 if $uniq; 2226 if $uniq;
2074 } 2227 }
2075 2228
2076 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2077 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2233 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2234
2082 $self->unlink_save; 2235 $self->unlink_save;
2083 $self->destroy; 2236 $self->destroy;
2084} 2237}
2085 2238
2086my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2087 2240
2088sub nuke { 2241sub nuke {
2089 my ($self) = @_; 2242 my ($self) = @_;
2090 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2091 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2092 2248
2093 $self->unlink_save; 2249 $self->unlink_save;
2094 2250
2095 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2256
2101 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2102 2259
2103 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2104} 2261}
2105 2262
2106=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
2182 2339
2183sub inv_recursive { 2340sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2185} 2342}
2186 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2187package cf; 2372package cf;
2188 2373
2189=back 2374=back
2190 2375
2191=head3 cf::object::player 2376=head3 cf::object::player
2213 2398
2214 } else { 2399 } else {
2215 my $pl = $self->contr; 2400 my $pl = $self->contr;
2216 2401
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2403 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2405
2226 } else { 2406 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2229 } 2409 }
2230 } 2410 }
2411}
2412
2413=item $object->send_msg ($channel, $msg, $color, [extra...])
2414
2415=cut
2416
2417sub cf::object::send_msg {
2418 my $pl = shift->contr
2419 or return;
2420 $pl->send_msg (@_);
2231} 2421}
2232 2422
2233=item $player_object->may ("access") 2423=item $player_object->may ("access")
2234 2424
2235Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
2317 2507
2318 $map->load; 2508 $map->load;
2319 $map->load_diag; 2509 $map->load_neighbours;
2320 2510
2321 return unless $self->contr->active; 2511 return unless $self->contr->active;
2322 $self->activate_recursive; 2512 $self->activate_recursive;
2323 2513
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2535
2346 $self->enter_link; 2536 $self->enter_link;
2347 2537
2348 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2349 my $map = eval { 2560 my $map = eval {
2350 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2351 2562
2352 if ($map) { 2563 if ($map) {
2353 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2355 } else { 2566 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2568 }
2358 2569
2359 $map 2570 $map
2360 }; 2571 };
2361 2572
2451 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2454 2665
2455 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2456 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2670 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2459 2672
2460 1; 2673 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2497 2710
2498=cut 2711=cut
2499 2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2500sub cf::client::send_msg { 2765sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2767
2503 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2504 2769
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2507 if (ref $channel) { 2781 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2512 } 2787 }
2513 2788
2514 $channel = $channel->{id}; 2789 $channel = $channel->{id};
2515 } 2790 }
2516 2791
2517 return unless @extra || length $msg; 2792 return unless @extra || length $msg;
2518 2793
2519 if ($self->can_msg) { 2794 if ($self->can_msg) {
2795 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF;
2798
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2801 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812
2813 $color &= cf::NDI_COLOR_MASK;
2814
2815 utf8::encode $msg;
2816
2533 if (0 && $msg =~ /\[/) { 2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2820 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2822 $self->send_packet ("drawinfo $color $msg")
2538 } 2823 }
2539 } 2824 }
2540 } 2825 }
2541} 2826}
2542 2827
2543=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2544 2829
2545Sends an ext event to the client. 2830Sends an ext event to the client.
2546 2831
2547=cut 2832=cut
2548 2833
2549sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2551 2836
2552 return unless $self->extcmd; 2837 if ($self->extcmd == 2) {
2553 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 }
2556} 2861}
2557 2862
2558=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2559 2864
2560Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2920 my ($ns, $buf) = @_;
2616 2921
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2923
2619 if (ref $msg) { 2924 if (ref $msg) {
2925 my ($type, $reply, @payload) =
2926 "ARRAY" eq ref $msg
2927 ? @$msg
2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2929
2930 my @reply;
2931
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2932 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2933 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2626 } else { 2939 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2941 }
2629 2942
2630 cf::override; 2943 cf::override;
2677our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2679 2992
2680$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2681 2994
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2995$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math
2997 grepstart grepwhile mapstart mapwhile
2998 sort time
2999));
2683 3000
2684# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2685 3002
2686=pod 3003=pod
2687 3004
2688The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2689 3006
2690 cf::object 3007 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3009 insert remove name archname title slaying race decrease_ob_nr
2693 3010
2694 cf::object::player 3011 cf::object::player
2695 player 3012 player
2696 3013
2697 cf::player 3014 cf::player
2702 3019
2703=cut 3020=cut
2704 3021
2705for ( 3022for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race
2707 insert remove)], 3025 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2711) { 3029) {
2712 no strict 'refs'; 3030 no strict 'refs';
2788# the server's init and main functions 3106# the server's init and main functions
2789 3107
2790sub load_facedata($) { 3108sub load_facedata($) {
2791 my ($path) = @_; 3109 my ($path) = @_;
2792 3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116
2793 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2794 3118
2795 my $facedata; 3119 my $facedata;
2796 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3121 or die "$path: $!";
2798 3122
2799 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2800 3124
2801 $facedata->{version} == 2 3125 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
2803 3134
2804 { 3135 {
2805 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2806 3137
2807 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3140 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3141 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3144
2814 cf::cede_to_tick; 3145 cf::cede_to_tick;
2815 } 3146 }
2816 3147
2817 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2842 3173
2843 { 3174 {
2844 # TODO: for gcfclient pleasure, we should give resources 3175 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3176 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3177 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
2848 3180
2849 while (my ($name, $info) = each %$res) { 3181 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
2857 3184
2858 if ($name =~ /\.jpg$/) { 3185 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3186 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3194 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3195 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3196 }
2868 3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
2869 cf::cede_to_tick; 3201 cf::cede_to_tick;
2870 } 3202 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
2871 } 3221 }
2872 3222
2873 1 3223 1
2874} 3224}
2875 3225
3226register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_;
3228
3229 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v);
3231 }
3232};
3233
2876sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2877 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
2879 3241
2880 for (cf::region::list) { 3242 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3243 $_->{match} = qr/$_->{match}/
2917 3279
2918sub init { 3280sub init {
2919 reload_resources; 3281 reload_resources;
2920} 3282}
2921 3283
2922sub cfg_load { 3284sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3286 or return;
2925 3287
2926 local $/; 3288 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2943sub main { 3305sub main {
2944 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2948 Event::one_event; 3311 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2950 }; 3313 };
2951 3314
2952 cfg_load; 3315 reload_config;
2953 db_init; 3316 db_init;
2954 load_extensions; 3317 load_extensions;
2955 3318
2956 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2957 Event::loop; 3320 Event::loop;
3024 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3393 $pl->save;
3030 } 3394 }
3031 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3032 3396
3033 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
3081 3445
3082 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3083 for (;;) { 3447 for (;;) {
3084 BDB::flush; 3448 BDB::flush;
3085 IO::AIO::flush; 3449 IO::AIO::flush;
3086 Coro::cede; 3450 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3452 warn "iterate...";
3089 } 3453 }
3090 3454
3091 ++$RELOAD; 3455 ++$RELOAD;
3150 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
3151 require cf; 3515 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3517
3154 warn "loading config and database again"; 3518 warn "loading config and database again";
3155 cf::cfg_load; 3519 cf::reload_config;
3156 3520
3157 warn "loading extensions"; 3521 warn "loading extensions";
3158 cf::load_extensions; 3522 cf::load_extensions;
3159 3523
3160 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
3196register_command "reload" => sub { 3560register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3198 3562
3199 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3567 reload_perl;
3568 };
3202 } 3569 }
3203}; 3570};
3204 3571
3205unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3206 3573
3225 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3594 $signal->wait;
3228} 3595}
3229 3596
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3598 reentrant => 0,
3234 parked => 1, 3599 parked => 1,
3235 prio => 0, 3600 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
3244 3609
3245 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3246 3611
3247 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3248 3613
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3274 3616
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3278 write_runtime 3621 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3623 };
3281 } 3624 }
3282 3625
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3627 $sig->send;
3288 } 3628 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3630 $sig->send;
3300 3640
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3643
3304 _post_tick; 3644 _post_tick;
3305
3306
3307 }, 3645 },
3308); 3646);
3309 3647
3310{ 3648{
3649 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3652 reentrant => 0,
3314 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3315 poll => 'r', 3654 poll => 'r',
3316 prio => 0, 3655 prio => 0,
3317 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3319 ); 3658 );
3320 BDB::min_parallel 8;
3321 3659
3322 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3323 my $status; 3661 my $status;
3324 my $current = $Coro::current; 3662 my $current = $Coro::current;
3325 ( 3663 (
3334 ) 3672 )
3335 }; 3673 };
3336 3674
3337 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3681
3340 cf::sync_job { 3682 cf::sync_job {
3341 eval { 3683 eval {
3342 BDB::db_env_open 3684 BDB::db_env_open
3343 $DB_ENV, 3685 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3689 0666;
3348 3690
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3692 };
3354 3693
3355 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3695 };
3357 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3358} 3728}
3359 3729
3360{ 3730{
3361 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3362 3732
3365 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3366 reentrant => 0, 3736 reentrant => 0,
3367 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3369 poll => 'r', 3739 poll => 'r',
3370 prio => 6, 3740 prio => 0,
3371 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3372 ); 3742 );
3373} 3743}
3374 3744
3375my $_log_backtrace; 3745my $_log_backtrace;
3381 3751
3382 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3754 ++$_log_backtrace;
3385 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3386 my @bt = fork_call { 3758 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines