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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 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"
412=cut 498=cut
413 499
414sub fork_call(&@) { 500sub fork_call(&@) {
415 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
416 502
417# 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,
418# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 506
422 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 508 reset_signals;
435 local $SIG{__WARN__}; 509 &$cb
436 local $SIG{__DIE__}; 510 }, @args;
437 eval {
438 close $fh1;
439 511
440 my @res = eval { $cb->(@args) }; 512 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 513}
448 514
449=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
450 516
451Returns a single value from the environment database. 517Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
454 520
455Stores 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
456data 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).
457 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
458=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}
459 547
460our $DB; 548our $DB;
461 549
462sub db_init { 550sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 551 cf::sync_job {
467 eval { 552 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 553 };
477} 554}
478 555
479sub db_get($$) { 556sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
481 558
531 if (1) { 608 if (1) {
532 $md5 = 609 $md5 =
533 join "\x00", 610 join "\x00",
534 $processversion, 611 $processversion,
535 map { 612 map {
536 Coro::cede; 613 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 615 } 0.. $#$src;
539 616
540 617
541 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
847 "; 924 ";
848 die if $@; 925 die if $@;
849} 926}
850 927
851our $override; 928our $override;
852our @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?
853 930
854sub override { 931sub override {
855 $override = 1; 932 $override = 1;
856 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
857} 934}
858 935
859sub do_invoke { 936sub do_invoke {
860 my $event = shift; 937 my $event = shift;
861 my $callbacks = shift; 938 my $callbacks = shift;
862 939
863 @invoke_results = (); 940 @INVOKE_RESULTS = ();
864 941
865 local $override; 942 local $override;
866 943
867 for (@$callbacks) { 944 for (@$callbacks) {
868 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
885 962
886Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
887 964
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 968
892=back 969=back
893 970
894=cut 971=cut
895 972
896############################################################################# 973#############################################################################
897# 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}
898 1017
899sub reattach { 1018sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1020 my ($obj) = @_;
902 1021
949sub object_freezer_save { 1068sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
951 1070
952 sync_job { 1071 sync_job {
953 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
956 1076
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1081 close $fh;
962 1082
963 if (@$objs) { 1083 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1089 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
971 } 1091 }
979 } 1099 }
980 } else { 1100 } else {
981 aio_unlink $filename; 1101 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
983 } 1103 }
984 } 1104 };
985} 1105}
986 1106
987sub object_freezer_as_string { 1107sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
989 1109
1001 or return; 1121 or return;
1002 1122
1003 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1125 or return;
1126
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1007 } 1129 }
1008 1130
1131 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1011 return ($data, $av); 1135 ($data, $av)
1012} 1136}
1013 1137
1014=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1015 1139
1016=over 4 1140=over 4
1089 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1090 1214
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1216
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1099 } else { 1232 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1234 }
1102 1235
1103 cf::override; 1236 cf::override;
1193 1326
1194=head3 cf::player 1327=head3 cf::player
1195 1328
1196=over 4 1329=over 4
1197 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
1198=item cf::player::find $login 1345=item cf::player::find $login
1199 1346
1200Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1201 1348
1202=cut 1349=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1388
1242 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1245 } 1397 }
1246 } 1398 }
1247} 1399}
1248 1400
1258 1410
1259 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1261 1413
1262 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1263 Coro::cede; 1415 cf::cede_to_tick;
1264} 1416}
1265 1417
1266sub new($) { 1418sub new($) {
1267 my ($login) = @_; 1419 my ($login) = @_;
1268 1420
1272 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1273 1425
1274 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1275 1427
1276 $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 (@_);
1277} 1439}
1278 1440
1279=item $pl->quit_character 1441=item $pl->quit_character
1280 1442
1281Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1498 or return [];
1337 1499
1338 my @logins; 1500 my @logins;
1339 1501
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1344 1511
1345 utf8::decode $login; 1512 utf8::decode $login;
1346 push @logins, $login; 1513 push @logins, $login;
1347 } 1514 }
1348 1515
1381 1548
1382Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1383 1550
1384=cut 1551=cut
1385 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1386sub expand_cfpod { 1563sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1388 1565
1389 # escape & and < 1566 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1567
1393 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1394 1571
1395 1 while 1572 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1577 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1578 <
1402 $self->gender ? $2 : $1 1579 (?:
1403 }ge 1580 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1581 | < $interior >
1405 || s{H<([^\>]*)>} 1582 )
1583 >
1584 %gcsx
1406 { 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") {
1407 ("<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>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1605 "")
1410 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1412 1617
1618 for ($xml) {
1413 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1415 1621
1416 # compress some whitespace 1622 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1418 1628
1419 $_ 1629 $xml
1420} 1630}
1421 1631
1422sub hintmode { 1632sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1634 $_[0]{hintmode}
1426} 1635}
1427 1636
1428=item $player->ext_reply ($msgid, %msg) 1637=item $player->ext_reply ($msgid, @msg)
1429 1638
1430Sends an ext reply to the player. 1639Sends an ext reply to the player.
1431 1640
1432=cut 1641=cut
1433 1642
1434sub ext_reply($$%) { 1643sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1644 my ($self, $id, @msg) = @_;
1436 1645
1437 $msg{msgid} = $id; 1646 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1647}
1440 1648
1441=item $player->ext_event ($type, %msg) 1649=item $player->ext_msg ($type, @msg)
1442 1650
1443Sends an ext event to the client. 1651Sends an ext event to the client.
1444 1652
1445=cut 1653=cut
1446 1654
1447sub ext_event($$%) { 1655sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1656 my ($self, $type, @msg) = @_;
1449 1657
1450 $self->ns->ext_event ($type, %msg); 1658 $self->ns->ext_msg ($type, @msg);
1451} 1659}
1452 1660
1453=head3 cf::region 1661=head3 cf::region
1454 1662
1455=over 4 1663=over 4
1468 my ($path) = @_; 1676 my ($path) = @_;
1469 1677
1470 my ($match, $specificity); 1678 my ($match, $specificity);
1471 1679
1472 for my $region (list) { 1680 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1681 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1682 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1683 if $region->specificity > $specificity;
1476 } 1684 }
1477 } 1685 }
1478 1686
1598 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1599 return $self; 1807 return $self;
1600 } 1808 }
1601 } 1809 }
1602 1810
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1812 ()
1605} 1813}
1606 1814
1607sub init { 1815sub init {
1608 my ($self) = @_; 1816 my ($self) = @_;
1671 1879
1672sub load_header_from($) { 1880sub load_header_from($) {
1673 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1674 1882
1675 utf8::encode $path; 1883 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1892
1682 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1683 1894
1684 1 1895 1
1685} 1896}
1739sub find { 1950sub find {
1740 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1741 1952
1742 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1743 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1745 1957
1746 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1747 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
1748 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1749 or return; 1963 or return;
1750 1964
1751 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1752 1966
1754 or return; 1968 or return;
1755 1969
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1759 $map->reset; 1975 $map->reset;
1760 undef $guard;
1761 return find $path; 1976 return find $path;
1762 } 1977 }
1763 1978
1764 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1765 } 1980 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1775 1990
1776 my $path = $self->{path}; 1991 my $path = $self->{path};
1777 1992
1778 { 1993 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1780 1995
1996 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 1998
1783 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1784 2000
1785 $self->alloc; 2001 $self->alloc;
1786 2002
1787 $self->pre_load; 2003 $self->pre_load;
1788 Coro::cede; 2004 cf::cede_to_tick;
1789 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1791 or return; 2009 or return;
1792 2010
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1795 2013
1796 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 2015 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 2018 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1801 } 2022 }
1802 } 2023 }
1803 2024
1804 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1805 # now do the right thing for maps 2028 # now do the right thing for maps
1806 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 2031 unless $self->difficulty;
1809 Coro::cede; 2032 cf::cede_to_tick;
1810 2033
1811 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 2035 $self->decay_objects;
1813 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1814 $self->update_buttons; 2037 $self->update_buttons;
1815 Coro::cede; 2038 cf::cede_to_tick;
1816 $self->set_darkness_map; 2039 $self->set_darkness_map;
1817 Coro::cede; 2040 cf::cede_to_tick;
1818 $self->activate; 2041 $self->activate;
1819 } 2042 }
2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
1820 2046
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 2048 }
1823 2049
1824 $self->post_load; 2050 $self->post_load;
1835 2061
1836 $self 2062 $self
1837} 2063}
1838 2064
1839# 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
1840sub load_diag { 2066sub load_neighbours {
1841 my ($map) = @_; 2067 my ($map) = @_;
1842 2068
1843 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1844 2070
1845 for (0 .. 3) { 2071 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1847 or next; 2073 or next;
1848 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1849 or next; 2075 or next;
1850 $neigh->load; 2076 $neigh->load;
1851 2077
2078 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2081 }
1855 2082
1856 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1858 or next; 2086 or next;
1859 $neigh->load; 2087 $neigh->load;
1860 } 2088 }
1861} 2089}
1862 2090
1867} 2095}
1868 2096
1869sub do_load_sync { 2097sub do_load_sync {
1870 my ($map) = @_; 2098 my ($map) = @_;
1871 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1872 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1873} 2104}
1874 2105
1875our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1877 2108
1878sub find_async { 2109sub find_async {
1879 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1880 2111
1881 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1882 2113
1883 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2116 }
1886 2117
1887 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1888 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1889 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2125 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2126 $map->load if $v;
2127 }
1894 2128
1895 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1896 } 2130 }
1897 } 2131 }
1898 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1899 }; 2133 };
1900 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1903} 2137}
1904 2138
1905sub save { 2139sub save {
1906 my ($self) = @_; 2140 my ($self) = @_;
1907 2141
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2143
1910 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1911 2145
1912 return unless $self->dirty; 2146 return unless $self->dirty;
1913 2147
1919 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1920 2154
1921 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1922 2156
1923 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1925 }; 2160 };
1926 2161
1927 if ($uniq) { 2162 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1936 my ($self) = @_; 2171 my ($self) = @_;
1937 2172
1938 # save first because save cedes 2173 # save first because save cedes
1939 $self->save; 2174 $self->save;
1940 2175
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2177
1943 return if $self->players; 2178 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1946 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2186 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2187}
1950 2188
1951sub reset_at { 2189sub reset_at {
1952 my ($self) = @_; 2190 my ($self) = @_;
1953 2191
1985 if $uniq; 2223 if $uniq;
1986 } 2224 }
1987 2225
1988 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
1989 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2230 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2231
1994 $self->unlink_save; 2232 $self->unlink_save;
1995 $self->destroy; 2233 $self->destroy;
1996} 2234}
1997 2235
1998my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
1999 2237
2000sub nuke { 2238sub nuke {
2001 my ($self) = @_; 2239 my ($self) = @_;
2002 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2003 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2004 2245
2005 $self->unlink_save; 2246 $self->unlink_save;
2006 2247
2007 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2253
2013 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2014 2256
2015 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2016} 2258}
2017 2259
2018=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
2094 2336
2095sub inv_recursive { 2337sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2097} 2339}
2098 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
2099package cf; 2369package cf;
2100 2370
2101=back 2371=back
2102 2372
2103=head3 cf::object::player 2373=head3 cf::object::player
2125 2395
2126 } else { 2396 } else {
2127 my $pl = $self->contr; 2397 my $pl = $self->contr;
2128 2398
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2399 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2400 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2402
2138 } else { 2403 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2404 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2141 } 2406 }
2142 } 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 (@_);
2143} 2418}
2144 2419
2145=item $player_object->may ("access") 2420=item $player_object->may ("access")
2146 2421
2147Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
2229 2504
2230 $map->load; 2505 $map->load;
2231 $map->load_diag; 2506 $map->load_neighbours;
2232 2507
2233 return unless $self->contr->active; 2508 return unless $self->contr->active;
2234 $self->activate_recursive; 2509 $self->activate_recursive;
2235 2510
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2512 $self->enter_map ($map, $x, $y);
2238} 2513}
2239 2514
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2516
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2518her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2522
2247=cut 2523=cut
2248 2524
2249our $GOTOGEN; 2525our $GOTOGEN;
2250 2526
2251sub cf::object::player::goto { 2527sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2528 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2529
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2532
2257 $self->enter_link; 2533 $self->enter_link;
2258 2534
2259 (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
2260 my $map = eval { 2557 my $map = eval {
2261 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2262 2559
2263 if ($map) { 2560 if ($map) {
2264 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2266 } else { 2563 } else {
2267 $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);
2268 } 2565 }
2269 2566
2270 $map 2567 $map
2271 }; 2568 };
2272 2569
2277 2574
2278 if ($gen == $self->{_goto_generation}) { 2575 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2576 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2577 $self->leave_link ($map, $x, $y);
2281 } 2578 }
2579
2580 $done->() if $done;
2282 })->prio (1); 2581 })->prio (1);
2283} 2582}
2284 2583
2285=item $player_object->enter_exit ($exit_object) 2584=item $player_object->enter_exit ($exit_object)
2286 2585
2355 my $hp = $exit->stats->hp; 2654 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2655 my $sp = $exit->stats->sp;
2357 2656
2358 $self->enter_link; 2657 $self->enter_link;
2359 2658
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2360 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2361 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2667 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2364 2669
2365 1; 2670 1;
2391 2696
2392 utf8::encode $text; 2697 utf8::encode $text;
2393 $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);
2394} 2699}
2395 2700
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2701=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2702
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2402 2707
2403=cut 2708=cut
2404 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
2405sub cf::client::send_msg { 2762sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2764
2408 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2789 return unless @extra || length $msg;
2790
2410 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
2411 $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]));
2412 } else { 2798 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 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
2424 if (0 && $msg =~ /\[/) { 2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2817 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2819 $self->send_packet ("drawinfo $color $msg")
2429 } 2820 }
2430 } 2821 }
2431 } 2822 }
2432} 2823}
2433 2824
2434=item $client->ext_event ($type, %msg) 2825=item $client->ext_msg ($type, @msg)
2435 2826
2436Sends an ext event to the client. 2827Sends an ext event to the client.
2437 2828
2438=cut 2829=cut
2439 2830
2440sub cf::client::ext_event($$%) { 2831sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2832 my ($self, $type, @msg) = @_;
2442 2833
2834 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2837 push @msg, msgtype => "event_$type";
2444 $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 }
2445} 2858}
2446 2859
2447=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
2448 2861
2449Queues a query to the client, calling the given callback with 2862Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 2917 my ($ns, $buf) = @_;
2505 2918
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2919 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2920
2508 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
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2929 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2930 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2515 } else { 2936 } else {
2516 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";
2517 } 2938 }
2518 2939
2519 cf::override; 2940 cf::override;
2566our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2568 2989
2569$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2570 2991
2571$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));
2572 2997
2573# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2574 2999
2575=pod 3000=pod
2576 3001
2577The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2578 3003
2579 cf::object contr pay_amount pay_player map 3004 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr
3007
2580 cf::object::player player 3008 cf::object::player
2581 cf::player peaceful 3009 player
2582 cf::map trigger 3010
3011 cf::player
3012 peaceful
3013
3014 cf::map
3015 trigger
2583 3016
2584=cut 3017=cut
2585 3018
2586for ( 3019for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 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
3022 decrease_ob_nr destroy)],
2588 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2591) { 3026) {
2592 no strict 'refs'; 3027 no strict 'refs';
2668# the server's init and main functions 3103# the server's init and main functions
2669 3104
2670sub load_facedata($) { 3105sub load_facedata($) {
2671 my ($path) = @_; 3106 my ($path) = @_;
2672 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
2673 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2674 3115
2675 my $facedata; 3116 my $facedata;
2676 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3118 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3120 $facedata = Coro::Storable::thaw $facedata;
2680 3121
2681 $facedata->{version} == 2 3122 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3123 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 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
2684 { 3132 {
2685 my $faces = $facedata->{faceinfo}; 3133 my $faces = $facedata->{faceinfo};
2686 3134
2687 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3137 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3141
3142 cf::cede_to_tick;
2693 } 3143 }
2694 3144
2695 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3146 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 3147 my $idx = cf::face::find $face
2698 or next; 3148 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3149 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3152 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3153 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3154 }
2704 Coro::cede; 3155
3156 cf::cede_to_tick;
2705 } 3157 }
2706 } 3158 }
2707 3159
2708 { 3160 {
2709 my $anims = $facedata->{animinfo}; 3161 my $anims = $facedata->{animinfo};
2710 3162
2711 while (my ($anim, $info) = each %$anims) { 3163 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3164 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3165 cf::cede_to_tick;
2714 } 3166 }
2715 3167
2716 cf::anim::invalidate_all; # d'oh 3168 cf::anim::invalidate_all; # d'oh
2717 } 3169 }
2718 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
2719 1 3220 1
2720} 3221}
2721 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
2722sub 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
2723 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2724 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 }
2725} 3243}
2726 3244
2727sub reload_facedata { 3245sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3246 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3247 or die "unable to load facedata\n";
2758 3276
2759sub init { 3277sub init {
2760 reload_resources; 3278 reload_resources;
2761} 3279}
2762 3280
2763sub cfg_load { 3281sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3283 or return;
2766 3284
2767 local $/; 3285 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
2784sub main { 3302sub main {
2785 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
2787 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#
2788 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
2789 Event::one_event; 3308 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
2791 }; 3310 };
2792 3311
2793 cfg_load; 3312 reload_config;
2794 db_init; 3313 db_init;
2795 load_extensions; 3314 load_extensions;
2796 3315
2797 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
2798 Event::loop; 3317 Event::loop;
2865 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3390 $pl->save;
2871 } 3391 }
2872 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
2873 3393
2874 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
2922 3442
2923 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
2924 for (;;) { 3444 for (;;) {
2925 BDB::flush; 3445 BDB::flush;
2926 IO::AIO::flush; 3446 IO::AIO::flush;
2927 Coro::cede; 3447 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3449 warn "iterate...";
2930 } 3450 }
2931 3451
2932 ++$RELOAD; 3452 ++$RELOAD;
2991 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
2992 require cf; 3512 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3514
2995 warn "loading config and database again"; 3515 warn "loading config and database again";
2996 cf::cfg_load; 3516 cf::reload_config;
2997 3517
2998 warn "loading extensions"; 3518 warn "loading extensions";
2999 cf::load_extensions; 3519 cf::load_extensions;
3000 3520
3001 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
3037register_command "reload" => sub { 3557register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3039 3559
3040 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3564 reload_perl;
3565 };
3043 } 3566 }
3044}; 3567};
3045 3568
3046unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3047 3570
3066 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3591 $signal->wait;
3069} 3592}
3070 3593
3071 my $min = 1e6;#d#
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
3074 reentrant => 0, 3595 reentrant => 0,
3075 parked => 1, 3596 parked => 1,
3076 prio => 0, 3597 prio => 0,
3077 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
3085 3606
3086 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
3087 3608
3088 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3089 3610
3090 0 && sync_job {#d#
3091 for(1..10) {
3092 my $t = Event::time;
3093 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3094 or die;
3095
3096 $map->width (50);
3097 $map->height (50);
3098 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1);
3100 my $t = Event::time - $t;
3101
3102 #next unless $t < 0.0013;#d#
3103 if ($t < $min) {
3104 $min = $t;
3105 }
3106 $avg = $avg * 0.99 + $t * 0.01;
3107 }
3108 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109 exit 0;
3110 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111 };
3112
3113 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3115 3613
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3119 write_runtime 3618 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3121 }; 3620 };
3122 } 3621 }
3123 3622
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3624 $sig->send;
3129 } 3625 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3627 $sig->send;
3141 3637
3142 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3640
3145 _post_tick; 3641 _post_tick;
3146
3147
3148 }, 3642 },
3149); 3643);
3150 3644
3151{ 3645{
3646 BDB::min_parallel 8;
3152 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3153 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3154 reentrant => 0, 3649 reentrant => 0,
3155 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3156 poll => 'r', 3651 poll => 'r',
3157 prio => 0, 3652 prio => 0,
3158 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3160 ); 3655 );
3161 BDB::min_parallel 8;
3162 3656
3163 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3164 my $status; 3658 my $status;
3165 my $current = $Coro::current; 3659 my $current = $Coro::current;
3166 ( 3660 (
3175 ) 3669 )
3176 }; 3670 };
3177 3671
3178 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3179 $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);
3180 3678
3181 cf::sync_job { 3679 cf::sync_job {
3182 eval { 3680 eval {
3183 BDB::db_env_open 3681 BDB::db_env_open
3184 $DB_ENV, 3682 $DB_ENV,
3186 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
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3686 0666;
3189 3687
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3193 $DB_ENV->set_lk_detect;
3194 }; 3689 };
3195 3690
3196 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3692 };
3198 } 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 );
3199} 3725}
3200 3726
3201{ 3727{
3202 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3203 3729
3206 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3207 reentrant => 0, 3733 reentrant => 0,
3208 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3210 poll => 'r', 3736 poll => 'r',
3211 prio => 6, 3737 prio => 0,
3212 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3213 ); 3739 );
3214} 3740}
3215 3741
3216my $_log_backtrace; 3742my $_log_backtrace;
3222 3748
3223 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3751 ++$_log_backtrace;
3226 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3227 my @bt = fork_call { 3755 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 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 |"
3231 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines