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.308 by root, Mon Jul 16 14:09:40 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
169returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
172=back 182=back
173 183
174=cut 184=cut
175 185
176BEGIN { 186BEGIN {
180 $msg .= "\n" 190 $msg .= "\n"
181 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
182 192
183 $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;
184 194
185 utf8::encode $msg;
186 LOG llevError, $msg; 195 LOG llevError, $msg;
187 }; 196 };
188} 197}
189 198
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
268returned. 277returned.
269 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
270Lock 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
271uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
272 284
273=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
274 286
275Return 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.
276 288
277=cut 289=cut
278 290
279our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
280 293
281sub lock_wait($) { 294sub lock_wait($) {
282 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#
283 301
284 # wait for lock, if any 302 # wait for lock, if any
285 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 305 Coro::schedule;
293 311
294 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
295 lock_wait $key; 313 lock_wait $key;
296 314
297 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
298 317
299 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
302 } 322 }
303} 323}
304 324
316 }; 336 };
317 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
318 $guard 338 $guard
319} 339}
320 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
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
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
321=item cf::async { BLOCK } 399=item cf::async { BLOCK }
322 400
323Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
324C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
328 406
329BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
330 408
331=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
332 410
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 412is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 414acceptable.
337 415
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
349 my $time = Event::time; 427 my $time = Event::time;
350 428
351 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
353 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
354 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
355 # (but this is cancel-safe) 435 # (but this is cancel-safe)
356 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
357 437
358 my $busy = 1; 438 my $busy = 1;
359 my @res; 439 my @res;
360 440
361 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 443 @res = eval { $job->() };
363 warn $@ if $@; 444 warn $@ if $@;
364 undef $busy; 445 undef $busy;
365 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
366 447
367 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
368 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
369 } 454 }
370 455
371 $time = Event::time - $time; 456 $time = Event::time - $time;
372 457
373 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
410Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
412 497
413=cut 498=cut
414 499
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 500sub fork_call(&@) {
425 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
426 502
427# 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,
428# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 506
432 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 508 reset_signals;
446 local $SIG{__WARN__}; 509 &$cb
447 local $SIG{__DIE__}; 510 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 511
454 eval { 512 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 513}
467 514
468=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
469 516
470Returns a single value from the environment database. 517Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
473 520
474Stores 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
475data 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).
476 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
477=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}
478 547
479our $DB; 548our $DB;
480 549
481sub db_init { 550sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 551 cf::sync_job {
486 eval { 552 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 553 };
496} 554}
497 555
498sub db_get($$) { 556sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
500 558
550 if (1) { 608 if (1) {
551 $md5 = 609 $md5 =
552 join "\x00", 610 join "\x00",
553 $processversion, 611 $processversion,
554 map { 612 map {
555 Coro::cede; 613 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 615 } 0.. $#$src;
558 616
559 617
560 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
606 664
607In 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>
608C<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
609Crossfire TRT). 667Deliantra).
610 668
611=over 4 669=over 4
612 670
613=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
614 672
866 "; 924 ";
867 die if $@; 925 die if $@;
868} 926}
869 927
870our $override; 928our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 930
873sub override { 931sub override {
874 $override = 1; 932 $override = 1;
875 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
876} 934}
877 935
878sub do_invoke { 936sub do_invoke {
879 my $event = shift; 937 my $event = shift;
880 my $callbacks = shift; 938 my $callbacks = shift;
881 939
882 @invoke_results = (); 940 @INVOKE_RESULTS = ();
883 941
884 local $override; 942 local $override;
885 943
886 for (@$callbacks) { 944 for (@$callbacks) {
887 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
904 962
905Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
906 964
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 968
911=back 969=back
912 970
913=cut 971=cut
914 972
915############################################################################# 973#############################################################################
916# object support 974# object support
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#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
917 1017
918sub reattach { 1018sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1020 my ($obj) = @_;
921 1021
968sub object_freezer_save { 1068sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
970 1070
971 sync_job { 1071 sync_job {
972 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
975 1076
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1081 close $fh;
981 1082
982 if (@$objs) { 1083 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1089 close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
990 } 1091 }
998 } 1099 }
999 } else { 1100 } else {
1000 aio_unlink $filename; 1101 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1002 } 1103 }
1003 } 1104 };
1004} 1105}
1005 1106
1006sub object_freezer_as_string { 1107sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1008 1109
1020 or return; 1121 or return;
1021 1122
1022 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1125 or return;
1126
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1026 } 1129 }
1027 1130
1131 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1030 return ($data, $av); 1135 ($data, $av)
1031} 1136}
1032 1137
1033=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1034 1139
1035=over 4 1140=over 4
1108 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1109 1214
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1216
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1118 } else { 1232 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1234 }
1121 1235
1122 cf::override; 1236 cf::override;
1212 1326
1213=head3 cf::player 1327=head3 cf::player
1214 1328
1215=over 4 1329=over 4
1216 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
1217=item cf::player::find $login 1345=item cf::player::find $login
1218 1346
1219Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1220 1348
1221=cut 1349=cut
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1388
1261 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1264 } 1397 }
1265 } 1398 }
1266} 1399}
1267 1400
1277 1410
1278 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1280 1413
1281 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1282 Coro::cede; 1415 cf::cede_to_tick;
1283} 1416}
1284 1417
1285sub new($) { 1418sub new($) {
1286 my ($login) = @_; 1419 my ($login) = @_;
1287 1420
1291 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1292 1425
1293 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1294 1427
1295 $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 (@_);
1296} 1439}
1297 1440
1298=item $pl->quit_character 1441=item $pl->quit_character
1299 1442
1300Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1498 or return [];
1356 1499
1357 my @logins; 1500 my @logins;
1358 1501
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1363 1511
1364 utf8::decode $login; 1512 utf8::decode $login;
1365 push @logins, $login; 1513 push @logins, $login;
1366 } 1514 }
1367 1515
1400 1548
1401Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1402 1550
1403=cut 1551=cut
1404 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
1405sub expand_cfpod { 1564sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1407 1566
1408 # escape & and < 1567 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1568
1412 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1413 1572
1414 1 while 1573 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1578 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1421 $self->gender ? $2 : $1 1580 (?:
1422 }ge 1581 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1582 | < $interior >
1424 || s{H<([^\>]*)>} 1583 )
1584 >
1585 %gcsx
1425 { 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") {
1426 ("<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>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1606 "")
1429 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1431 1618
1619 for ($xml) {
1432 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1434 1622
1435 # compress some whitespace 1623 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1440 1629
1441 $_ 1630 $xml
1442} 1631}
1632
1633no re 'eval';
1443 1634
1444sub hintmode { 1635sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1637 $_[0]{hintmode}
1447} 1638}
1448 1639
1449=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1450 1641
1451Sends an ext reply to the player. 1642Sends an ext reply to the player.
1452 1643
1453=cut 1644=cut
1454 1645
1455sub ext_reply($$%) { 1646sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1457 1648
1458 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1650}
1461 1651
1462=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1463 1653
1464Sends an ext event to the client. 1654Sends an ext event to the client.
1465 1655
1466=cut 1656=cut
1467 1657
1468sub ext_event($$%) { 1658sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1470 1660
1471 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1472} 1662}
1473 1663
1474=head3 cf::region 1664=head3 cf::region
1475 1665
1476=over 4 1666=over 4
1692 1882
1693sub load_header_from($) { 1883sub load_header_from($) {
1694 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1695 1885
1696 utf8::encode $path; 1886 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1895
1703 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1704 1897
1705 1 1898 1
1706} 1899}
1760sub find { 1953sub find {
1761 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1762 1955
1763 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1764 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1766 1960
1767 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1768 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
1769 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1770 or return; 1966 or return;
1771 1967
1772 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1773 1969
1775 or return; 1971 or return;
1776 1972
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1780 $map->reset; 1978 $map->reset;
1781 undef $guard;
1782 return find $path; 1979 return find $path;
1783 } 1980 }
1784 1981
1785 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1786 } 1983 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1796 1993
1797 my $path = $self->{path}; 1994 my $path = $self->{path};
1798 1995
1799 { 1996 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1801 1998
1999 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2001
1804 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1805 2003
1806 $self->alloc; 2004 $self->alloc;
1807 2005
1808 $self->pre_load; 2006 $self->pre_load;
1809 Coro::cede; 2007 cf::cede_to_tick;
1810 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1812 or return; 2012 or return;
1813 2013
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1816 2016
1817 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2018 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2021 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1822 } 2025 }
1823 } 2026 }
1824 2027
1825 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1826 # now do the right thing for maps 2031 # now do the right thing for maps
1827 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2034 unless $self->difficulty;
1830 Coro::cede; 2035 cf::cede_to_tick;
1831 2036
1832 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2038 $self->decay_objects;
1834 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1835 $self->update_buttons; 2040 $self->update_buttons;
1836 Coro::cede; 2041 cf::cede_to_tick;
1837 $self->set_darkness_map; 2042 $self->set_darkness_map;
1838 Coro::cede; 2043 cf::cede_to_tick;
1839 $self->activate; 2044 $self->activate;
1840 } 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
1841 2049
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2050 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2051 }
1844 2052
1845 $self->post_load; 2053 $self->post_load;
1856 2064
1857 $self 2065 $self
1858} 2066}
1859 2067
1860# 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
1861sub load_diag { 2069sub load_neighbours {
1862 my ($map) = @_; 2070 my ($map) = @_;
1863 2071
1864 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1865 2073
1866 for (0 .. 3) { 2074 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1868 or next; 2076 or next;
1869 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1870 or next; 2078 or next;
1871 $neigh->load; 2079 $neigh->load;
1872 2080
2081 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2084 }
1876 2085
1877 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1879 or next; 2089 or next;
1880 $neigh->load; 2090 $neigh->load;
1881 } 2091 }
1882} 2092}
1883 2093
1888} 2098}
1889 2099
1890sub do_load_sync { 2100sub do_load_sync {
1891 my ($map) = @_; 2101 my ($map) = @_;
1892 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1893 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1894} 2107}
1895 2108
1896our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1898 2111
1899sub find_async { 2112sub find_async {
1900 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1901 2114
1902 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1903 2116
1904 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2119 }
1907 2120
1908 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1909 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1910 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2128 if (my $map = find $k) {
1913 $map->load; 2129 $map->load if $v;
1914 } 2130 }
1915 2131
1916 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1917 } 2133 }
1918 } 2134 }
1919 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1920 }; 2136 };
1921 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1924} 2140}
1925 2141
1926sub save { 2142sub save {
1927 my ($self) = @_; 2143 my ($self) = @_;
1928 2144
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2146
1931 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1932 2148
1933 return unless $self->dirty; 2149 return unless $self->dirty;
1934 2150
1940 return if $self->{deny_save}; 2156 return if $self->{deny_save};
1941 2157
1942 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
1943 2159
1944 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
1946 }; 2163 };
1947 2164
1948 if ($uniq) { 2165 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2174 my ($self) = @_;
1958 2175
1959 # save first because save cedes 2176 # save first because save cedes
1960 $self->save; 2177 $self->save;
1961 2178
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2180
1964 return if $self->players; 2181 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1967 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2189 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2190}
1971 2191
1972sub reset_at { 2192sub reset_at {
1973 my ($self) = @_; 2193 my ($self) = @_;
1974 2194
2006 if $uniq; 2226 if $uniq;
2007 } 2227 }
2008 2228
2009 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2010 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2233 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2234
2015 $self->unlink_save; 2235 $self->unlink_save;
2016 $self->destroy; 2236 $self->destroy;
2017} 2237}
2018 2238
2019my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2020 2240
2021sub nuke { 2241sub nuke {
2022 my ($self) = @_; 2242 my ($self) = @_;
2023 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2024 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2025 2248
2026 $self->unlink_save; 2249 $self->unlink_save;
2027 2250
2028 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2256
2034 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2035 2259
2036 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2037} 2261}
2038 2262
2039=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
2115 2339
2116sub inv_recursive { 2340sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2118} 2342}
2119 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
2120package cf; 2372package cf;
2121 2373
2122=back 2374=back
2123 2375
2124=head3 cf::object::player 2376=head3 cf::object::player
2146 2398
2147 } else { 2399 } else {
2148 my $pl = $self->contr; 2400 my $pl = $self->contr;
2149 2401
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2403 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2405
2159 } else { 2406 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2162 } 2409 }
2163 } 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 (@_);
2164} 2421}
2165 2422
2166=item $player_object->may ("access") 2423=item $player_object->may ("access")
2167 2424
2168Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
2250 2507
2251 $map->load; 2508 $map->load;
2252 $map->load_diag; 2509 $map->load_neighbours;
2253 2510
2254 return unless $self->contr->active; 2511 return unless $self->contr->active;
2255 $self->activate_recursive; 2512 $self->activate_recursive;
2256 2513
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2535
2279 $self->enter_link; 2536 $self->enter_link;
2280 2537
2281 (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
2282 my $map = eval { 2560 my $map = eval {
2283 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2284 2562
2285 if ($map) { 2563 if ($map) {
2286 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2288 } else { 2566 } else {
2289 $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);
2290 } 2568 }
2291 2569
2292 $map 2570 $map
2293 }; 2571 };
2294 2572
2384 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2387 2665
2388 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2389 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2390 unless (eval { 2670 unless (eval {
2391 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2392 2672
2393 1; 2673 1;
2419 2699
2420 utf8::encode $text; 2700 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2702}
2423 2703
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2704=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2705
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2706Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2707client if neccessary. C<$type> should be a string identifying the type of
2428the 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
2429the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2430 2710
2431=cut 2711=cut
2432 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
2433sub cf::client::send_msg { 2765sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2767
2436 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2437 2769
2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2781 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2787 }
2788
2789 $channel = $channel->{id};
2790 }
2791
2438 return unless @extra || length $msg; 2792 return unless @extra || length $msg;
2439 2793
2440 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
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2801 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 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
2454 if (0 && $msg =~ /\[/) { 2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2820 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2822 $self->send_packet ("drawinfo $color $msg")
2459 } 2823 }
2460 } 2824 }
2461 } 2825 }
2462} 2826}
2463 2827
2464=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2465 2829
2466Sends an ext event to the client. 2830Sends an ext event to the client.
2467 2831
2468=cut 2832=cut
2469 2833
2470sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2472 2836
2473 return unless $self->extcmd; 2837 if ($self->extcmd == 2) {
2474 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2476 $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 }
2477} 2861}
2478 2862
2479=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2480 2864
2481Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2920 my ($ns, $buf) = @_;
2537 2921
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2923
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2932 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2933 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2547 } else { 2939 } else {
2548 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";
2549 } 2941 }
2550 2942
2551 cf::override; 2943 cf::override;
2598our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2600 2992
2601$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2602 2994
2603$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));
2604 3000
2605# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2606 3002
2607=pod 3003=pod
2608 3004
2609The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2610 3006
2611 cf::object 3007 cf::object
2612 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
2613 insert remove 3009 insert remove name archname title slaying race decrease_ob_nr
2614 3010
2615 cf::object::player 3011 cf::object::player
2616 player 3012 player
2617 3013
2618 cf::player 3014 cf::player
2623 3019
2624=cut 3020=cut
2625 3021
2626for ( 3022for (
2627 ["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
2628 insert remove)], 3025 decrease_ob_nr destroy)],
2629 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2632) { 3029) {
2633 no strict 'refs'; 3030 no strict 'refs';
2709# the server's init and main functions 3106# the server's init and main functions
2710 3107
2711sub load_facedata($) { 3108sub load_facedata($) {
2712 my ($path) = @_; 3109 my ($path) = @_;
2713 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
2714 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2715 3118
2716 my $facedata; 3119 my $facedata;
2717 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3121 or die "$path: $!";
2719 3122
2720 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2721 3124
2722 $facedata->{version} == 2 3125 $facedata->{version} == 2
2723 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;
2724 3134
2725 { 3135 {
2726 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2727 3137
2728 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility}; 3140 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3141 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3144
2735 cf::cede_to_tick; 3145 cf::cede_to_tick;
2736 } 3146 }
2737 3147
2738 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2763 3173
2764 { 3174 {
2765 # TODO: for gcfclient pleasure, we should give resources 3175 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3176 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3177 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
2769 3180
2770 while (my ($name, $info) = each %$res) { 3181 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
2778 3184
2779 if ($name =~ /\.jpg$/) { 3185 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3186 # prepend meta info
2781 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};
2782 } else { 3194 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3195 $data = $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3196 }
2789 3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
2790 cf::cede_to_tick; 3201 cf::cede_to_tick;
2791 } 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 }
2792 } 3221 }
2793 3222
2794 1 3223 1
2795} 3224}
2796 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
2797sub 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
2798 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
2800 3241
2801 for (cf::region::list) { 3242 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3243 $_->{match} = qr/$_->{match}/
2838 3279
2839sub init { 3280sub init {
2840 reload_resources; 3281 reload_resources;
2841} 3282}
2842 3283
2843sub cfg_load { 3284sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3286 or return;
2846 3287
2847 local $/; 3288 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2864sub main { 3305sub main {
2865 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2867 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#
2868 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2869 Event::one_event; 3311 Event::one_event;
2870 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2871 }; 3313 };
2872 3314
2873 cfg_load; 3315 reload_config;
2874 db_init; 3316 db_init;
2875 load_extensions; 3317 load_extensions;
2876 3318
2877 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2878 Event::loop; 3320 Event::loop;
2945 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
2947 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3393 $pl->save;
2951 } 3394 }
2952 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
2953 3396
2954 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
3002 3445
3003 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3004 for (;;) { 3447 for (;;) {
3005 BDB::flush; 3448 BDB::flush;
3006 IO::AIO::flush; 3449 IO::AIO::flush;
3007 Coro::cede; 3450 Coro::cede_notself;
3008 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3009 warn "iterate..."; 3452 warn "iterate...";
3010 } 3453 }
3011 3454
3012 ++$RELOAD; 3455 ++$RELOAD;
3071 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
3072 require cf; 3515 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3517
3075 warn "loading config and database again"; 3518 warn "loading config and database again";
3076 cf::cfg_load; 3519 cf::reload_config;
3077 3520
3078 warn "loading extensions"; 3521 warn "loading extensions";
3079 cf::load_extensions; 3522 cf::load_extensions;
3080 3523
3081 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
3117register_command "reload" => sub { 3560register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3119 3562
3120 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3567 reload_perl;
3568 };
3123 } 3569 }
3124}; 3570};
3125 3571
3126unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3127 3573
3146 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3594 $signal->wait;
3149} 3595}
3150 3596
3151 my $min = 1e6;#d#
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3154 reentrant => 0, 3598 reentrant => 0,
3155 parked => 1, 3599 parked => 1,
3156 prio => 0, 3600 prio => 0,
3157 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
3165 3609
3166 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3167 3611
3168 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3169 3613
3170 0 && sync_job {#d#
3171 for(1..10) {
3172 my $t = Event::time;
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3174 or die;
3175
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 };
3192
3193 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3195 3616
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3199 write_runtime 3621 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3201 }; 3623 };
3202 } 3624 }
3203 3625
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3627 $sig->send;
3209 } 3628 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3630 $sig->send;
3221 3640
3222 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3643
3225 _post_tick; 3644 _post_tick;
3226
3227
3228 }, 3645 },
3229); 3646);
3230 3647
3231{ 3648{
3649 BDB::min_parallel 8;
3232 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3233 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3234 reentrant => 0, 3652 reentrant => 0,
3235 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3236 poll => 'r', 3654 poll => 'r',
3237 prio => 0, 3655 prio => 0,
3238 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3240 ); 3658 );
3241 BDB::min_parallel 8;
3242 3659
3243 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3244 my $status; 3661 my $status;
3245 my $current = $Coro::current; 3662 my $current = $Coro::current;
3246 ( 3663 (
3255 ) 3672 )
3256 }; 3673 };
3257 3674
3258 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3259 $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);
3260 3681
3261 cf::sync_job { 3682 cf::sync_job {
3262 eval { 3683 eval {
3263 BDB::db_env_open 3684 BDB::db_env_open
3264 $DB_ENV, 3685 $DB_ENV,
3266 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
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3689 0666;
3269 3690
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3692 };
3275 3693
3276 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3695 };
3278 } 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 );
3279} 3728}
3280 3729
3281{ 3730{
3282 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3283 3732
3286 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3287 reentrant => 0, 3736 reentrant => 0,
3288 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3290 poll => 'r', 3739 poll => 'r',
3291 prio => 6, 3740 prio => 0,
3292 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3293 ); 3742 );
3294} 3743}
3295 3744
3296my $_log_backtrace; 3745my $_log_backtrace;
3302 3751
3303 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3754 ++$_log_backtrace;
3306 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3307 my @bt = fork_call { 3758 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 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 |"
3311 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines