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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.392 by root, Fri Oct 26 04:44:54 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;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
78our $NEXT_TICK; 80our $NEXT_TICK;
79our $NOW; 81our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
81 83
82our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 88our $DB_ENV;
84 89
85our %CFG; 90our %CFG;
86 91
87our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 93our $RUNTIME;
89 94
90our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
93 98
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 101
166 171
167These 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
168returns 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
169per 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.
170 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
171=back 182=back
172 183
173=cut 184=cut
174 185
175BEGIN { 186BEGIN {
179 $msg .= "\n" 190 $msg .= "\n"
180 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
181 192
182 $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;
183 194
184 utf8::encode $msg;
185 LOG llevError, $msg; 195 LOG llevError, $msg;
186 }; 196 };
187} 197}
188 198
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
267returned. 277returned.
268 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
269Lock 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
270uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
271 284
272=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
273 286
274Return 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.
275 288
276=cut 289=cut
277 290
278our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
279 293
280sub lock_wait($) { 294sub lock_wait($) {
281 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#
282 301
283 # wait for lock, if any 302 # wait for lock, if any
284 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 305 Coro::schedule;
292 311
293 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
294 lock_wait $key; 313 lock_wait $key;
295 314
296 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
297 317
298 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
301 } 322 }
302} 323}
303 324
315 }; 336 };
316 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
317 $guard 338 $guard
318} 339}
319 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
320=item cf::async { BLOCK } 399=item cf::async { BLOCK }
321 400
322Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
348 my $time = Event::time; 427 my $time = Event::time;
349 428
350 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
352 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
353 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
354 # (but this is cancel-safe) 435 # (but this is cancel-safe)
355 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
356 437
357 my $busy = 1; 438 my $busy = 1;
358 my @res; 439 my @res;
359 440
360 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 443 @res = eval { $job->() };
362 warn $@ if $@; 444 warn $@ if $@;
363 undef $busy; 445 undef $busy;
364 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
365 447
366 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
367 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
368 } 454 }
369 455
370 $time = Event::time - $time; 456 $time = Event::time - $time;
371 457
372 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
409Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
411 497
412=cut 498=cut
413 499
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 500sub fork_call(&@) {
424 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
425 502
426# 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,
427# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 506
431 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 508 reset_signals;
445 local $SIG{__WARN__}; 509 &$cb
446 local $SIG{__DIE__}; 510 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 511
453 eval { 512 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 513}
466 514
467=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
468 516
469Returns a single value from the environment database. 517Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
472 520
473Stores 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
474data 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).
475 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
476=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}
477 547
478our $DB; 548our $DB;
479 549
480sub db_init { 550sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 551 cf::sync_job {
485 eval { 552 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 553 };
495} 554}
496 555
497sub db_get($$) { 556sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
499 558
549 if (1) { 608 if (1) {
550 $md5 = 609 $md5 =
551 join "\x00", 610 join "\x00",
552 $processversion, 611 $processversion,
553 map { 612 map {
554 Coro::cede; 613 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 615 } 0.. $#$src;
557 616
558 617
559 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
865 "; 924 ";
866 die if $@; 925 die if $@;
867} 926}
868 927
869our $override; 928our $override;
870our @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?
871 930
872sub override { 931sub override {
873 $override = 1; 932 $override = 1;
874 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
875} 934}
876 935
877sub do_invoke { 936sub do_invoke {
878 my $event = shift; 937 my $event = shift;
879 my $callbacks = shift; 938 my $callbacks = shift;
880 939
881 @invoke_results = (); 940 @INVOKE_RESULTS = ();
882 941
883 local $override; 942 local $override;
884 943
885 for (@$callbacks) { 944 for (@$callbacks) {
886 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
903 962
904Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
905 964
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 968
910=back 969=back
911 970
912=cut 971=cut
913 972
914############################################################################# 973#############################################################################
915# 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}
916 1017
917sub reattach { 1018sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1020 my ($obj) = @_;
920 1021
967sub object_freezer_save { 1068sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
969 1070
970 sync_job { 1071 sync_job {
971 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
974 1076
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
979 close $fh; 1081 close $fh;
980 1082
981 if (@$objs) { 1083 if (@$objs) {
982 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) {
983 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
987 close $fh; 1089 close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
989 } 1091 }
997 } 1099 }
998 } else { 1100 } else {
999 aio_unlink $filename; 1101 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1001 } 1103 }
1002 } 1104 };
1003} 1105}
1004 1106
1005sub object_freezer_as_string { 1107sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1007 1109
1019 or return; 1121 or return;
1020 1122
1021 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1125 or return;
1126
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1025 } 1129 }
1026 1130
1131 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1029 return ($data, $av); 1135 ($data, $av)
1030} 1136}
1031 1137
1032=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1033 1139
1034=over 4 1140=over 4
1107 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1108 1214
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1216
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1117 } else { 1232 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1234 }
1120 1235
1121 cf::override; 1236 cf::override;
1211 1326
1212=head3 cf::player 1327=head3 cf::player
1213 1328
1214=over 4 1329=over 4
1215 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
1216=item cf::player::find $login 1345=item cf::player::find $login
1217 1346
1218Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1219 1348
1220=cut 1349=cut
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1388
1260 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1261 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;
1262 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1263 } 1397 }
1264 } 1398 }
1265} 1399}
1266 1400
1276 1410
1277 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1279 1413
1280 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1281 Coro::cede; 1415 cf::cede_to_tick;
1282} 1416}
1283 1417
1284sub new($) { 1418sub new($) {
1285 my ($login) = @_; 1419 my ($login) = @_;
1286 1420
1290 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1291 1425
1292 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1293 1427
1294 $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 (@_);
1295} 1439}
1296 1440
1297=item $pl->quit_character 1441=item $pl->quit_character
1298 1442
1299Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1498 or return [];
1355 1499
1356 my @logins; 1500 my @logins;
1357 1501
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1362 1511
1363 utf8::decode $login; 1512 utf8::decode $login;
1364 push @logins, $login; 1513 push @logins, $login;
1365 } 1514 }
1366 1515
1399 1548
1400Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1401 1550
1402=cut 1551=cut
1403 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1404sub expand_cfpod { 1563sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1406 1565
1407 # escape & and < 1566 my $xml;
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410 1567
1411 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1;
1412 1571
1413 1 while 1572 $group =~ s/&/&amp;/g;
1414 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1418 # replace G<male|female> tags 1577 ([BCGHITU])
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1578 <
1420 $self->gender ? $2 : $1 1579 (?:
1421 }ge 1580 ([^<>]*) (?{ $group = $^N })
1422 # replace H<hint text> 1581 | < $interior >
1423 || s{H<([^\>]*)>} 1582 )
1583 >
1584 %gcsx
1424 { 1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "") 1605 "")
1428 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1429 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1430 1617
1618 for ($xml) {
1431 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1433 1621
1434 # compress some whitespace 1622 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1439 1628
1440 warn $_;#d# 1629 $xml
1441 $_
1442} 1630}
1443 1631
1444sub hintmode { 1632sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1634 $_[0]{hintmode}
1447} 1635}
1448 1636
1449=item $player->ext_reply ($msgid, %msg) 1637=item $player->ext_reply ($msgid, @msg)
1450 1638
1451Sends an ext reply to the player. 1639Sends an ext reply to the player.
1452 1640
1453=cut 1641=cut
1454 1642
1455sub ext_reply($$%) { 1643sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1644 my ($self, $id, @msg) = @_;
1457 1645
1458 $msg{msgid} = $id; 1646 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1647}
1461 1648
1462=item $player->ext_event ($type, %msg) 1649=item $player->ext_msg ($type, @msg)
1463 1650
1464Sends an ext event to the client. 1651Sends an ext event to the client.
1465 1652
1466=cut 1653=cut
1467 1654
1468sub ext_event($$%) { 1655sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1656 my ($self, $type, @msg) = @_;
1470 1657
1471 $self->ns->ext_event ($type, %msg); 1658 $self->ns->ext_msg ($type, @msg);
1472} 1659}
1473 1660
1474=head3 cf::region 1661=head3 cf::region
1475 1662
1476=over 4 1663=over 4
1489 my ($path) = @_; 1676 my ($path) = @_;
1490 1677
1491 my ($match, $specificity); 1678 my ($match, $specificity);
1492 1679
1493 for my $region (list) { 1680 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1681 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1682 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1683 if $region->specificity > $specificity;
1497 } 1684 }
1498 } 1685 }
1499 1686
1619 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1620 return $self; 1807 return $self;
1621 } 1808 }
1622 } 1809 }
1623 1810
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1812 ()
1626} 1813}
1627 1814
1628sub init { 1815sub init {
1629 my ($self) = @_; 1816 my ($self) = @_;
1692 1879
1693sub load_header_from($) { 1880sub load_header_from($) {
1694 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1695 1882
1696 utf8::encode $path; 1883 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1702 1892
1703 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1704 1894
1705 1 1895 1
1706} 1896}
1760sub find { 1950sub find {
1761 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1762 1952
1763 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1764 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1766 1957
1767 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1769 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1770 or return; 1963 or return;
1771 1964
1772 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1773 1966
1775 or return; 1968 or return;
1776 1969
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1780 $map->reset; 1975 $map->reset;
1781 undef $guard;
1782 return find $path; 1976 return find $path;
1783 } 1977 }
1784 1978
1785 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1786 } 1980 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1796 1990
1797 my $path = $self->{path}; 1991 my $path = $self->{path};
1798 1992
1799 { 1993 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1801 1995
1996 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 1998
1804 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1805 2000
1806 $self->alloc; 2001 $self->alloc;
1807 2002
1808 $self->pre_load; 2003 $self->pre_load;
1809 Coro::cede; 2004 cf::cede_to_tick;
1810 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1812 or return; 2009 or return;
1813 2010
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1816 2013
1817 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2015 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2018 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1822 } 2022 }
1823 } 2023 }
1824 2024
1825 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1826 # now do the right thing for maps 2028 # now do the right thing for maps
1827 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2031 unless $self->difficulty;
1830 Coro::cede; 2032 cf::cede_to_tick;
1831 2033
1832 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2035 $self->decay_objects;
1834 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1835 $self->update_buttons; 2037 $self->update_buttons;
1836 Coro::cede; 2038 cf::cede_to_tick;
1837 $self->set_darkness_map; 2039 $self->set_darkness_map;
1838 Coro::cede; 2040 cf::cede_to_tick;
1839 $self->activate; 2041 $self->activate;
1840 } 2042 }
2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
1841 2046
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2048 }
1844 2049
1845 $self->post_load; 2050 $self->post_load;
1856 2061
1857 $self 2062 $self
1858} 2063}
1859 2064
1860# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2066sub load_neighbours {
1862 my ($map) = @_; 2067 my ($map) = @_;
1863 2068
1864 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1865 2070
1866 for (0 .. 3) { 2071 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1868 or next; 2073 or next;
1869 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1870 or next; 2075 or next;
1871 $neigh->load; 2076 $neigh->load;
1872 2077
2078 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2081 }
1876 2082
1877 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1879 or next; 2086 or next;
1880 $neigh->load; 2087 $neigh->load;
1881 } 2088 }
1882} 2089}
1883 2090
1888} 2095}
1889 2096
1890sub do_load_sync { 2097sub do_load_sync {
1891 my ($map) = @_; 2098 my ($map) = @_;
1892 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1893 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1894} 2104}
1895 2105
1896our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1898 2108
1899sub find_async { 2109sub find_async {
1900 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1901 2111
1902 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1903 2113
1904 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2116 }
1907 2117
1908 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1909 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1910 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2125 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2126 $map->load if $v;
2127 }
1915 2128
1916 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1917 } 2130 }
1918 } 2131 }
1919 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1920 }; 2133 };
1921 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1924} 2137}
1925 2138
1926sub save { 2139sub save {
1927 my ($self) = @_; 2140 my ($self) = @_;
1928 2141
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2143
1931 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1932 2145
1933 return unless $self->dirty; 2146 return unless $self->dirty;
1934 2147
1940 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1941 2154
1942 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1943 2156
1944 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1946 }; 2160 };
1947 2161
1948 if ($uniq) { 2162 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2171 my ($self) = @_;
1958 2172
1959 # save first because save cedes 2173 # save first because save cedes
1960 $self->save; 2174 $self->save;
1961 2175
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2177
1964 return if $self->players; 2178 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1967 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2186 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2187}
1971 2188
1972sub reset_at { 2189sub reset_at {
1973 my ($self) = @_; 2190 my ($self) = @_;
1974 2191
2006 if $uniq; 2223 if $uniq;
2007 } 2224 }
2008 2225
2009 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2010 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2230 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2231
2015 $self->unlink_save; 2232 $self->unlink_save;
2016 $self->destroy; 2233 $self->destroy;
2017} 2234}
2018 2235
2019my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2020 2237
2021sub nuke { 2238sub nuke {
2022 my ($self) = @_; 2239 my ($self) = @_;
2023 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2024 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2025 2245
2026 $self->unlink_save; 2246 $self->unlink_save;
2027 2247
2028 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2253
2034 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2035 2256
2036 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2037} 2258}
2038 2259
2039=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
2115 2336
2116sub inv_recursive { 2337sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2118} 2339}
2119 2340
2341=item $ref = $ob->ref
2342
2343creates and returns a persistent reference to an objetc that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2120package cf; 2369package cf;
2121 2370
2122=back 2371=back
2123 2372
2124=head3 cf::object::player 2373=head3 cf::object::player
2146 2395
2147 } else { 2396 } else {
2148 my $pl = $self->contr; 2397 my $pl = $self->contr;
2149 2398
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2399 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2400 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2401 $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 2402
2159 } else { 2403 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2404 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2162 } 2406 }
2163 } 2407 }
2408}
2409
2410=item $object->send_msg ($channel, $msg, $color, [extra...])
2411
2412=cut
2413
2414sub cf::object::send_msg {
2415 my $pl = shift->contr
2416 or return;
2417 $pl->send_msg (@_);
2164} 2418}
2165 2419
2166=item $player_object->may ("access") 2420=item $player_object->may ("access")
2167 2421
2168Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
2250 2504
2251 $map->load; 2505 $map->load;
2252 $map->load_diag; 2506 $map->load_neighbours;
2253 2507
2254 return unless $self->contr->active; 2508 return unless $self->contr->active;
2255 $self->activate_recursive; 2509 $self->activate_recursive;
2256 2510
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2512 $self->enter_map ($map, $x, $y);
2259} 2513}
2260 2514
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2516
2263Moves the player to the given map-path and coordinates by first freezing 2517Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2518her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2519that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2520the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process.
2267 2522
2268=cut 2523=cut
2269 2524
2270our $GOTOGEN; 2525our $GOTOGEN;
2271 2526
2272sub cf::object::player::goto { 2527sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2528 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2529
2275 # do generation counting so two concurrent goto's will be executed in-order 2530 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2532
2278 $self->enter_link; 2533 $self->enter_link;
2279 2534
2280 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2538 # *tag paths override both path and x|y
2539 if ($path =~ /^\*(.*)$/) {
2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2541 my $ob = $obs[rand @obs];
2542
2543 # see if we actually can go there
2544 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2545 $ob = $obs[rand @obs];
2546 } else {
2547 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2548 }
2549 # else put us there anyways for now #d#
2550
2551 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2552 } else {
2553 ($path, $x, $y) = (undef, undef, undef);
2554 }
2555 }
2556
2281 my $map = eval { 2557 my $map = eval {
2282 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2283 2559
2284 if ($map) { 2560 if ($map) {
2285 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2287 } else { 2563 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2565 }
2290 2566
2291 $map 2567 $map
2292 }; 2568 };
2293 2569
2298 2574
2299 if ($gen == $self->{_goto_generation}) { 2575 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2576 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2577 $self->leave_link ($map, $x, $y);
2302 } 2578 }
2579
2580 $done->() if $done;
2303 })->prio (1); 2581 })->prio (1);
2304} 2582}
2305 2583
2306=item $player_object->enter_exit ($exit_object) 2584=item $player_object->enter_exit ($exit_object)
2307 2585
2381 # if exit is damned, update players death & WoR home-position 2659 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp) 2660 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED); 2661 if $exit->flag (FLAG_DAMNED);
2384 2662
2385 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2386 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2387 unless (eval { 2667 unless (eval {
2388 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2389 2669
2390 1; 2670 1;
2416 2696
2417 utf8::encode $text; 2697 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2699}
2420 2700
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2701=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2702
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2703Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2704client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2705the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2427 2707
2428=cut 2708=cut
2429 2709
2710# non-persistent channels (usually the info channel)
2711our %CHANNEL = (
2712 "c/identify" => {
2713 id => "infobox",
2714 title => "Identify",
2715 reply => undef,
2716 tooltip => "Items recently identified",
2717 },
2718 "c/examine" => {
2719 id => "infobox",
2720 title => "Examine",
2721 reply => undef,
2722 tooltip => "Signs and other items you examined",
2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2760);
2761
2430sub cf::client::send_msg { 2762sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2764
2433 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2434 2766
2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768
2769 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2778 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2784 }
2785
2786 $channel = $channel->{id};
2787 }
2788
2435 return unless @extra || length $msg; 2789 return unless @extra || length $msg;
2436 2790
2437 if ($self->can_msg) { 2791 if ($self->can_msg) {
2792 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF;
2795
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2796 $self->send_packet ("msg " . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2798 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809
2810 $color &= cf::NDI_COLOR_MASK;
2811
2812 utf8::encode $msg;
2813
2451 if (0 && $msg =~ /\[/) { 2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2817 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2819 $self->send_packet ("drawinfo $color $msg")
2456 } 2820 }
2457 } 2821 }
2458 } 2822 }
2459} 2823}
2460 2824
2461=item $client->ext_event ($type, %msg) 2825=item $client->ext_msg ($type, @msg)
2462 2826
2463Sends an ext event to the client. 2827Sends an ext event to the client.
2464 2828
2465=cut 2829=cut
2466 2830
2467sub cf::client::ext_event($$%) { 2831sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2832 my ($self, $type, @msg) = @_;
2469 2833
2834 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2837 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 }
2840}
2841
2842=item $client->ext_reply ($msgid, @msg)
2843
2844Sends an ext reply to the client.
2845
2846=cut
2847
2848sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_;
2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2472} 2858}
2473 2859
2474=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
2475 2861
2476Queues a query to the client, calling the given callback with 2862Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 2917 my ($ns, $buf) = @_;
2532 2918
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2919 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2920
2535 if (ref $msg) { 2921 if (ref $msg) {
2922 my ($type, $reply, @payload) =
2923 "ARRAY" eq ref $msg
2924 ? @$msg
2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2926
2927 my @reply;
2928
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2929 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2930 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2542 } else { 2936 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2938 }
2545 2939
2546 cf::override; 2940 cf::override;
2593our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2595 2989
2596$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2597 2991
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2992$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math
2994 grepstart grepwhile mapstart mapwhile
2995 sort time
2996));
2599 2997
2600# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2601 2999
2602=pod 3000=pod
2603 3001
2604The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2605 3003
2606 cf::object 3004 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3005 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3006 insert remove name archname title slaying race decrease_ob_nr
2609 3007
2610 cf::object::player 3008 cf::object::player
2611 player 3009 player
2612 3010
2613 cf::player 3011 cf::player
2618 3016
2619=cut 3017=cut
2620 3018
2621for ( 3019for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race
2623 insert remove)], 3022 decrease_ob_nr destroy)],
2624 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2627) { 3026) {
2628 no strict 'refs'; 3027 no strict 'refs';
2704# the server's init and main functions 3103# the server's init and main functions
2705 3104
2706sub load_facedata($) { 3105sub load_facedata($) {
2707 my ($path) = @_; 3106 my ($path) = @_;
2708 3107
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113
2709 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2710 3115
2711 my $facedata; 3116 my $facedata;
2712 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3118 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3120 $facedata = Coro::Storable::thaw $facedata;
2716 3121
2717 $facedata->{version} == 2 3122 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3123 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3124
3125 # patch in the exptable
3126 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3129 };
3130 cf::cede_to_tick;
3131
2720 { 3132 {
2721 my $faces = $facedata->{faceinfo}; 3133 my $faces = $facedata->{faceinfo};
2722 3134
2723 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3137 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 3141
3142 cf::cede_to_tick;
2729 } 3143 }
2730 3144
2731 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 3146 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 3147 my $idx = cf::face::find $face
2734 or next; 3148 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 3149 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 3152 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3153 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 3154 }
2740 Coro::cede; 3155
3156 cf::cede_to_tick;
2741 } 3157 }
2742 } 3158 }
2743 3159
2744 { 3160 {
2745 my $anims = $facedata->{animinfo}; 3161 my $anims = $facedata->{animinfo};
2746 3162
2747 while (my ($anim, $info) = each %$anims) { 3163 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3164 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 3165 cf::cede_to_tick;
2750 } 3166 }
2751 3167
2752 cf::anim::invalidate_all; # d'oh 3168 cf::anim::invalidate_all; # d'oh
2753 } 3169 }
2754 3170
3171 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource};
3175
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181
3182 if ($info->{type} & 1) {
3183 # prepend meta info
3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
3191 } else {
3192 $data = $info->{data};
3193 }
3194
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick;
3199 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 }
3219
2755 1 3220 1
2756} 3221}
2757 3222
3223register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_;
3225
3226 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v);
3228 }
3229};
3230
2758sub reload_regions { 3231sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = ();
3235
2759 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 3237 or die "unable to load regions file\n";
3238
3239 for (cf::region::list) {
3240 $_->{match} = qr/$_->{match}/
3241 if exists $_->{match};
3242 }
2761} 3243}
2762 3244
2763sub reload_facedata { 3245sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3246 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3247 or die "unable to load facedata\n";
2794 3276
2795sub init { 3277sub init {
2796 reload_resources; 3278 reload_resources;
2797} 3279}
2798 3280
2799sub cfg_load { 3281sub reload_config {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3283 or return;
2802 3284
2803 local $/; 3285 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
2820sub main { 3302sub main {
2821 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
2822 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
2823 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2824 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
2825 Event::one_event; 3308 Event::one_event;
2826 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
2827 }; 3310 };
2828 3311
2829 cfg_load; 3312 reload_config;
2830 db_init; 3313 db_init;
2831 load_extensions; 3314 load_extensions;
2832 3315
2833 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
2834 Event::loop; 3317 Event::loop;
2901 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
2902 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
2903 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
2904 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
2905 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906 $pl->save; 3390 $pl->save;
2907 } 3391 }
2908 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
2909 3393
2910 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
2958 3442
2959 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
2960 for (;;) { 3444 for (;;) {
2961 BDB::flush; 3445 BDB::flush;
2962 IO::AIO::flush; 3446 IO::AIO::flush;
2963 Coro::cede; 3447 Coro::cede_notself;
2964 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
2965 warn "iterate..."; 3449 warn "iterate...";
2966 } 3450 }
2967 3451
2968 ++$RELOAD; 3452 ++$RELOAD;
3027 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
3028 require cf; 3512 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3514
3031 warn "loading config and database again"; 3515 warn "loading config and database again";
3032 cf::cfg_load; 3516 cf::reload_config;
3033 3517
3034 warn "loading extensions"; 3518 warn "loading extensions";
3035 cf::load_extensions; 3519 cf::load_extensions;
3036 3520
3037 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
3073register_command "reload" => sub { 3557register_command "reload" => sub {
3074 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3075 3559
3076 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3077 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3078 async { reload_perl }; 3564 reload_perl;
3565 };
3079 } 3566 }
3080}; 3567};
3081 3568
3082unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3083 3570
3102 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait; 3591 $signal->wait;
3105} 3592}
3106 3593
3107 my $min = 1e6;#d#
3108 my $avg = 10;
3109$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
3110 reentrant => 0, 3595 reentrant => 0,
3111 parked => 1, 3596 parked => 1,
3112 prio => 0, 3597 prio => 0,
3113 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
3121 3606
3122 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
3123 3608
3124 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3125 3610
3126 0 && sync_job {#d#
3127 for(1..10) {
3128 my $t = Event::time;
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3130 or die;
3131
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 };
3148
3149 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
3150 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3151 3613
3152 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3154 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3155 write_runtime 3618 write_runtime
3156 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3157 }; 3620 };
3158 } 3621 }
3159 3622
3160# my $AFTER = Event::time;
3161# warn $AFTER - $NOW;#d#
3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send; 3624 $sig->send;
3165 } 3625 }
3166 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send; 3627 $sig->send;
3177 3637
3178 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180 3640
3181 _post_tick; 3641 _post_tick;
3182
3183
3184 }, 3642 },
3185); 3643);
3186 3644
3187{ 3645{
3646 BDB::min_parallel 8;
3188 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3189 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3190 reentrant => 0, 3649 reentrant => 0,
3191 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3192 poll => 'r', 3651 poll => 'r',
3193 prio => 0, 3652 prio => 0,
3194 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3196 ); 3655 );
3197 BDB::min_parallel 8;
3198 3656
3199 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3200 my $status; 3658 my $status;
3201 my $current = $Coro::current; 3659 my $current = $Coro::current;
3202 ( 3660 (
3211 ) 3669 )
3212 }; 3670 };
3213 3671
3214 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3215 $DB_ENV = BDB::db_env_create; 3673 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1);
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3216 3678
3217 cf::sync_job { 3679 cf::sync_job {
3218 eval { 3680 eval {
3219 BDB::db_env_open 3681 BDB::db_env_open
3220 $DB_ENV, 3682 $DB_ENV,
3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3684 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666; 3686 0666;
3225 3687
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 }; 3689 };
3231 3690
3232 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3233 }; 3692 };
3234 } 3693 }
3694
3695 $BDB_DEADLOCK_WATCHER = Event->timer (
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 );
3705 $BDB_CHECKPOINT_WATCHER = Event->timer (
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 );
3715 $BDB_TRICKLE_WATCHER = Event->timer (
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 );
3235} 3725}
3236 3726
3237{ 3727{
3238 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3239 3729
3242 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3243 reentrant => 0, 3733 reentrant => 0,
3244 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3245 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3246 poll => 'r', 3736 poll => 'r',
3247 prio => 6, 3737 prio => 0,
3248 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3249 ); 3739 );
3250} 3740}
3251 3741
3252my $_log_backtrace; 3742my $_log_backtrace;
3258 3748
3259 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3260 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace; 3751 ++$_log_backtrace;
3262 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3263 my @bt = fork_call { 3755 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3267 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines