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.389 by root, Sat Oct 20 04:39:57 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
1386sub expand_cfpod { 1553sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1388 1555
1389 # escape & and < 1556 # escape & and <
1390 s/&/&amp;/g; 1557 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1392 1559
1393 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1394 1561
1395 1 while 1562 1 while
1396 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1568 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1403 }ge 1571 }ge
1404 # replace H<hint text> 1572 # replace H<hint text>
1412 1580
1413 # create single paragraphs (very hackish) 1581 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1582 s/(?<=\S)\n(?=\w)/ /g;
1415 1583
1416 # compress some whitespace 1584 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1418 1589
1419 $_ 1590 $_
1420} 1591}
1421 1592
1422sub hintmode { 1593sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1595 $_[0]{hintmode}
1426} 1596}
1427 1597
1428=item $player->ext_reply ($msgid, %msg) 1598=item $player->ext_reply ($msgid, @msg)
1429 1599
1430Sends an ext reply to the player. 1600Sends an ext reply to the player.
1431 1601
1432=cut 1602=cut
1433 1603
1434sub ext_reply($$%) { 1604sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1605 my ($self, $id, @msg) = @_;
1436 1606
1437 $msg{msgid} = $id; 1607 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1608}
1440 1609
1441=item $player->ext_event ($type, %msg) 1610=item $player->ext_msg ($type, @msg)
1442 1611
1443Sends an ext event to the client. 1612Sends an ext event to the client.
1444 1613
1445=cut 1614=cut
1446 1615
1447sub ext_event($$%) { 1616sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1617 my ($self, $type, @msg) = @_;
1449 1618
1450 $self->ns->ext_event ($type, %msg); 1619 $self->ns->ext_msg ($type, @msg);
1451} 1620}
1452 1621
1453=head3 cf::region 1622=head3 cf::region
1454 1623
1455=over 4 1624=over 4
1468 my ($path) = @_; 1637 my ($path) = @_;
1469 1638
1470 my ($match, $specificity); 1639 my ($match, $specificity);
1471 1640
1472 for my $region (list) { 1641 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1642 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1643 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1644 if $region->specificity > $specificity;
1476 } 1645 }
1477 } 1646 }
1478 1647
1598 $self->init; # pass $1 etc. 1767 $self->init; # pass $1 etc.
1599 return $self; 1768 return $self;
1600 } 1769 }
1601 } 1770 }
1602 1771
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1772 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1773 ()
1605} 1774}
1606 1775
1607sub init { 1776sub init {
1608 my ($self) = @_; 1777 my ($self) = @_;
1671 1840
1672sub load_header_from($) { 1841sub load_header_from($) {
1673 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1674 1843
1675 utf8::encode $path; 1844 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1681 1853
1682 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1683 1855
1684 1 1856 1
1685} 1857}
1739sub find { 1911sub find {
1740 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1741 1913
1742 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1743 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1745 1918
1746 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1747 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1748 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1749 or return; 1924 or return;
1750 1925
1751 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1752 1927
1754 or return; 1929 or return;
1755 1930
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1759 $map->reset; 1936 $map->reset;
1760 undef $guard;
1761 return find $path; 1937 return find $path;
1762 } 1938 }
1763 1939
1764 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1765 } 1941 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1775 1951
1776 my $path = $self->{path}; 1952 my $path = $self->{path};
1777 1953
1778 { 1954 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1780 1956
1957 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 1959
1783 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1784 1961
1785 $self->alloc; 1962 $self->alloc;
1786 1963
1787 $self->pre_load; 1964 $self->pre_load;
1788 Coro::cede; 1965 cf::cede_to_tick;
1789 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1791 or return; 1970 or return;
1792 1971
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1795 1974
1796 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 1976 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 1979 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1801 } 1983 }
1802 } 1984 }
1803 1985
1804 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1805 # now do the right thing for maps 1989 # now do the right thing for maps
1806 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 1992 unless $self->difficulty;
1809 Coro::cede; 1993 cf::cede_to_tick;
1810 1994
1811 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 1996 $self->decay_objects;
1813 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1814 $self->update_buttons; 1998 $self->update_buttons;
1815 Coro::cede; 1999 cf::cede_to_tick;
1816 $self->set_darkness_map; 2000 $self->set_darkness_map;
1817 Coro::cede; 2001 cf::cede_to_tick;
1818 $self->activate; 2002 $self->activate;
1819 } 2003 }
2004
2005 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME);
1820 2007
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2008 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 2009 }
1823 2010
1824 $self->post_load; 2011 $self->post_load;
1835 2022
1836 $self 2023 $self
1837} 2024}
1838 2025
1839# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1840sub load_diag { 2027sub load_neighbours {
1841 my ($map) = @_; 2028 my ($map) = @_;
1842 2029
1843 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1844 2031
1845 for (0 .. 3) { 2032 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1847 or next; 2034 or next;
1848 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1849 or next; 2036 or next;
1850 $neigh->load; 2037 $neigh->load;
1851 2038
2039 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2042 }
1855 2043
1856 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1858 or next; 2047 or next;
1859 $neigh->load; 2048 $neigh->load;
1860 } 2049 }
1861} 2050}
1862 2051
1867} 2056}
1868 2057
1869sub do_load_sync { 2058sub do_load_sync {
1870 my ($map) = @_; 2059 my ($map) = @_;
1871 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1872 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1873} 2065}
1874 2066
1875our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1877 2069
1878sub find_async { 2070sub find_async {
1879 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1880 2072
1881 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1882 2074
1883 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2077 }
1886 2078
1887 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1888 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1889 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2086 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2087 $map->load if $v;
2088 }
1894 2089
1895 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1896 } 2091 }
1897 } 2092 }
1898 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1899 }; 2094 };
1900 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
1903} 2098}
1904 2099
1905sub save { 2100sub save {
1906 my ($self) = @_; 2101 my ($self) = @_;
1907 2102
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2104
1910 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1911 2106
1912 return unless $self->dirty; 2107 return unless $self->dirty;
1913 2108
1919 return if $self->{deny_save}; 2114 return if $self->{deny_save};
1920 2115
1921 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
1922 2117
1923 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
1925 }; 2121 };
1926 2122
1927 if ($uniq) { 2123 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1936 my ($self) = @_; 2132 my ($self) = @_;
1937 2133
1938 # save first because save cedes 2134 # save first because save cedes
1939 $self->save; 2135 $self->save;
1940 2136
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2138
1943 return if $self->players; 2139 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2141 return if $self->{deny_save};
1946 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2147 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2148}
1950 2149
1951sub reset_at { 2150sub reset_at {
1952 my ($self) = @_; 2151 my ($self) = @_;
1953 2152
1985 if $uniq; 2184 if $uniq;
1986 } 2185 }
1987 2186
1988 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
1989 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2191 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2192
1994 $self->unlink_save; 2193 $self->unlink_save;
1995 $self->destroy; 2194 $self->destroy;
1996} 2195}
1997 2196
1998my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
1999 2198
2000sub nuke { 2199sub nuke {
2001 my ($self) = @_; 2200 my ($self) = @_;
2002 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2003 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2004 2206
2005 $self->unlink_save; 2207 $self->unlink_save;
2006 2208
2007 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2214
2013 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2014 2217
2015 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2016} 2219}
2017 2220
2018=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
2094 2297
2095sub inv_recursive { 2298sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2097} 2300}
2098 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2099package cf; 2330package cf;
2100 2331
2101=back 2332=back
2102 2333
2103=head3 cf::object::player 2334=head3 cf::object::player
2125 2356
2126 } else { 2357 } else {
2127 my $pl = $self->contr; 2358 my $pl = $self->contr;
2128 2359
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2360 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2361 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2362 $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 2363
2138 } else { 2364 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2365 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2366 $self->message ($msg, $flags);
2141 } 2367 }
2142 } 2368 }
2369}
2370
2371=item $object->send_msg ($channel, $msg, $color, [extra...])
2372
2373=cut
2374
2375sub cf::object::send_msg {
2376 my $pl = shift->contr
2377 or return;
2378 $pl->send_msg (@_);
2143} 2379}
2144 2380
2145=item $player_object->may ("access") 2381=item $player_object->may ("access")
2146 2382
2147Returns wether the given player is authorized to access resource "access" 2383Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2229 2465
2230 $map->load; 2466 $map->load;
2231 $map->load_diag; 2467 $map->load_neighbours;
2232 2468
2233 return unless $self->contr->active; 2469 return unless $self->contr->active;
2234 $self->activate_recursive; 2470 $self->activate_recursive;
2235 2471
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2473 $self->enter_map ($map, $x, $y);
2238} 2474}
2239 2475
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2477
2242Moves the player to the given map-path and coordinates by first freezing 2478Moves the player to the given map-path and coordinates by first freezing
2243her, loading and preparing them map, calling the provided $check callback 2479her, loading and preparing them map, calling the provided $check callback
2244that has to return the map if sucecssful, and then unfreezes the player on 2480that has to return the map if sucecssful, and then unfreezes the player on
2245the new (success) or old (failed) map position. 2481the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process.
2246 2483
2247=cut 2484=cut
2248 2485
2249our $GOTOGEN; 2486our $GOTOGEN;
2250 2487
2251sub cf::object::player::goto { 2488sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2489 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2490
2254 # do generation counting so two concurrent goto's will be executed in-order 2491 # do generation counting so two concurrent goto's will be executed in-order
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2493
2257 $self->enter_link; 2494 $self->enter_link;
2258 2495
2259 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2260 my $map = eval { 2518 my $map = eval {
2261 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2262 2520
2263 if ($map) { 2521 if ($map) {
2264 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2266 } else { 2524 } else {
2267 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2268 } 2526 }
2269 2527
2270 $map 2528 $map
2271 }; 2529 };
2272 2530
2277 2535
2278 if ($gen == $self->{_goto_generation}) { 2536 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2537 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2538 $self->leave_link ($map, $x, $y);
2281 } 2539 }
2540
2541 $done->() if $done;
2282 })->prio (1); 2542 })->prio (1);
2283} 2543}
2284 2544
2285=item $player_object->enter_exit ($exit_object) 2545=item $player_object->enter_exit ($exit_object)
2286 2546
2355 my $hp = $exit->stats->hp; 2615 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2616 my $sp = $exit->stats->sp;
2357 2617
2358 $self->enter_link; 2618 $self->enter_link;
2359 2619
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2360 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2361 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2628 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2364 2630
2365 1; 2631 1;
2391 2657
2392 utf8::encode $text; 2658 utf8::encode $text;
2393 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2394} 2660}
2395 2661
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2662=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2663
2398Send a drawinfo or msg packet to the client, formatting the msg for the 2664Send 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 2665client 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 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2401the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2402 2668
2403=cut 2669=cut
2404 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696);
2697
2405sub cf::client::send_msg { 2698sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2700
2408 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2409 2702
2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704
2705 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2714 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel)
2719 if $self->can_msg;
2720 }
2721
2722 $channel = $channel->{id};
2723 }
2724
2725 return unless @extra || length $msg;
2726
2410 if ($self->can_msg) { 2727 if ($self->can_msg) {
2728 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF;
2731
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2732 $self->send_packet ("msg " . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2734 } 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) { 2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745
2746 $color &= cf::NDI_COLOR_MASK;
2747
2748 utf8::encode $msg;
2749
2424 if (0 && $msg =~ /\[/) { 2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2753 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2755 $self->send_packet ("drawinfo $color $msg")
2429 } 2756 }
2430 } 2757 }
2431 } 2758 }
2432} 2759}
2433 2760
2434=item $client->ext_event ($type, %msg) 2761=item $client->ext_msg ($type, @msg)
2435 2762
2436Sends an ext event to the client. 2763Sends an ext event to the client.
2437 2764
2438=cut 2765=cut
2439 2766
2440sub cf::client::ext_event($$%) { 2767sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2768 my ($self, $type, @msg) = @_;
2442 2769
2770 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2773 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 }
2776}
2777
2778=item $client->ext_reply ($msgid, @msg)
2779
2780Sends an ext reply to the client.
2781
2782=cut
2783
2784sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_;
2786
2787 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 }
2445} 2794}
2446 2795
2447=item $success = $client->query ($flags, "text", \&cb) 2796=item $success = $client->query ($flags, "text", \&cb)
2448 2797
2449Queues a query to the client, calling the given callback with 2798Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 2853 my ($ns, $buf) = @_;
2505 2854
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2855 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2856
2508 if (ref $msg) { 2857 if (ref $msg) {
2858 my ($type, $reply, @payload) =
2859 "ARRAY" eq ref $msg
2860 ? @$msg
2861 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2862
2863 my @reply;
2864
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2865 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2866 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2867 }
2868
2869 $ns->ext_reply ($reply, @reply)
2870 if $reply;
2871
2515 } else { 2872 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 2874 }
2518 2875
2519 cf::override; 2876 cf::override;
2566our $safe = new Safe "safe"; 2923our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2924our $safe_hole = new Safe::Hole;
2568 2925
2569$SIG{FPE} = 'IGNORE'; 2926$SIG{FPE} = 'IGNORE';
2570 2927
2571$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2928$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math
2930 grepstart grepwhile mapstart mapwhile
2931 sort time
2932));
2572 2933
2573# here we export the classes and methods available to script code 2934# here we export the classes and methods available to script code
2574 2935
2575=pod 2936=pod
2576 2937
2577The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2578 2939
2579 cf::object contr pay_amount pay_player map 2940 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr
2943
2580 cf::object::player player 2944 cf::object::player
2581 cf::player peaceful 2945 player
2582 cf::map trigger 2946
2947 cf::player
2948 peaceful
2949
2950 cf::map
2951 trigger
2583 2952
2584=cut 2953=cut
2585 2954
2586for ( 2955for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race
2958 decrease_ob_nr destroy)],
2588 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2591) { 2962) {
2592 no strict 'refs'; 2963 no strict 'refs';
2668# the server's init and main functions 3039# the server's init and main functions
2669 3040
2670sub load_facedata($) { 3041sub load_facedata($) {
2671 my ($path) = @_; 3042 my ($path) = @_;
2672 3043
3044 # HACK to clear player env face cache, we need some signal framework
3045 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = ();
3047
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049
2673 warn "loading facedata from $path\n"; 3050 warn "loading facedata from $path\n";
2674 3051
2675 my $facedata; 3052 my $facedata;
2676 0 < aio_load $path, $facedata 3053 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3054 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3056 $facedata = Coro::Storable::thaw $facedata;
2680 3057
2681 $facedata->{version} == 2 3058 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3059 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 3060
3061 # patch in the exptable
3062 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3065 };
3066 cf::cede_to_tick;
3067
2684 { 3068 {
2685 my $faces = $facedata->{faceinfo}; 3069 my $faces = $facedata->{faceinfo};
2686 3070
2687 while (my ($face, $info) = each %$faces) { 3071 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3072 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3073 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3077
3078 cf::cede_to_tick;
2693 } 3079 }
2694 3080
2695 while (my ($face, $info) = each %$faces) { 3081 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3082 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 3083 my $idx = cf::face::find $face
2698 or next; 3084 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3085 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3088 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3089 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3090 }
2704 Coro::cede; 3091
3092 cf::cede_to_tick;
2705 } 3093 }
2706 } 3094 }
2707 3095
2708 { 3096 {
2709 my $anims = $facedata->{animinfo}; 3097 my $anims = $facedata->{animinfo};
2710 3098
2711 while (my ($anim, $info) = each %$anims) { 3099 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3100 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3101 cf::cede_to_tick;
2714 } 3102 }
2715 3103
2716 cf::anim::invalidate_all; # d'oh 3104 cf::anim::invalidate_all; # d'oh
2717 } 3105 }
2718 3106
3107 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource};
3111
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117
3118 if ($info->{type} & 1) {
3119 # prepend meta info
3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
3127 } else {
3128 $data = $info->{data};
3129 }
3130
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick;
3135 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 }
3155
2719 1 3156 1
2720} 3157}
2721 3158
3159register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_;
3161
3162 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v);
3164 }
3165};
3166
2722sub reload_regions { 3167sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = ();
3171
2723 load_resource_file "$MAPDIR/regions" 3172 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 3173 or die "unable to load regions file\n";
3174
3175 for (cf::region::list) {
3176 $_->{match} = qr/$_->{match}/
3177 if exists $_->{match};
3178 }
2725} 3179}
2726 3180
2727sub reload_facedata { 3181sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3182 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3183 or die "unable to load facedata\n";
2758 3212
2759sub init { 3213sub init {
2760 reload_resources; 3214 reload_resources;
2761} 3215}
2762 3216
2763sub cfg_load { 3217sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3218 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3219 or return;
2766 3220
2767 local $/; 3221 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3222 *CFG = YAML::Syck::Load <$fh>;
2784sub main { 3238sub main {
2785 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
2787 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2788 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
2789 Event::one_event; 3244 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
2791 }; 3246 };
2792 3247
2793 cfg_load; 3248 reload_config;
2794 db_init; 3249 db_init;
2795 load_extensions; 3250 load_extensions;
2796 3251
2797 $TICK_WATCHER->start; 3252 $TICK_WATCHER->start;
2798 Event::loop; 3253 Event::loop;
2865 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3326 $pl->save;
2871 } 3327 }
2872 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
2873 3329
2874 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
2922 3378
2923 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
2924 for (;;) { 3380 for (;;) {
2925 BDB::flush; 3381 BDB::flush;
2926 IO::AIO::flush; 3382 IO::AIO::flush;
2927 Coro::cede; 3383 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3385 warn "iterate...";
2930 } 3386 }
2931 3387
2932 ++$RELOAD; 3388 ++$RELOAD;
2991 warn "reloading cf.pm"; 3447 warn "reloading cf.pm";
2992 require cf; 3448 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3450
2995 warn "loading config and database again"; 3451 warn "loading config and database again";
2996 cf::cfg_load; 3452 cf::reload_config;
2997 3453
2998 warn "loading extensions"; 3454 warn "loading extensions";
2999 cf::load_extensions; 3455 cf::load_extensions;
3000 3456
3001 warn "reattaching attachments to objects/players"; 3457 warn "reattaching attachments to objects/players";
3037register_command "reload" => sub { 3493register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3039 3495
3040 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3500 reload_perl;
3501 };
3043 } 3502 }
3044}; 3503};
3045 3504
3046unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3047 3506
3066 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3527 $signal->wait;
3069} 3528}
3070 3529
3071 my $min = 1e6;#d#
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
3074 reentrant => 0, 3531 reentrant => 0,
3075 parked => 1, 3532 parked => 1,
3076 prio => 0, 3533 prio => 0,
3077 at => $NEXT_TICK || $TICK, 3534 at => $NEXT_TICK || $TICK,
3085 3542
3086 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
3087 3544
3088 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
3089 3546
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; 3547 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3115 3549
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3119 write_runtime 3554 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3121 }; 3556 };
3122 } 3557 }
3123 3558
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3560 $sig->send;
3129 } 3561 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3563 $sig->send;
3141 3573
3142 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3576
3145 _post_tick; 3577 _post_tick;
3146
3147
3148 }, 3578 },
3149); 3579);
3150 3580
3151{ 3581{
3582 BDB::min_parallel 8;
3152 BDB::max_poll_time $TICK * 0.1; 3583 BDB::max_poll_time $TICK * 0.1;
3153 $BDB_POLL_WATCHER = Event->io ( 3584 $BDB_POLL_WATCHER = Event->io (
3154 reentrant => 0, 3585 reentrant => 0,
3155 fd => BDB::poll_fileno, 3586 fd => BDB::poll_fileno,
3156 poll => 'r', 3587 poll => 'r',
3157 prio => 0, 3588 prio => 0,
3158 data => WF_AUTOCANCEL, 3589 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb, 3590 cb => \&BDB::poll_cb,
3160 ); 3591 );
3161 BDB::min_parallel 8;
3162 3592
3163 BDB::set_sync_prepare { 3593 BDB::set_sync_prepare {
3164 my $status; 3594 my $status;
3165 my $current = $Coro::current; 3595 my $current = $Coro::current;
3166 ( 3596 (
3175 ) 3605 )
3176 }; 3606 };
3177 3607
3178 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
3179 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180 3614
3181 cf::sync_job { 3615 cf::sync_job {
3182 eval { 3616 eval {
3183 BDB::db_env_open 3617 BDB::db_env_open
3184 $DB_ENV, 3618 $DB_ENV,
3186 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3622 0666;
3189 3623
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 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 }; 3625 };
3195 3626
3196 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3628 };
3198 } 3629 }
3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 );
3651 $BDB_TRICKLE_WATCHER = Event->timer (
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 );
3199} 3661}
3200 3662
3201{ 3663{
3202 IO::AIO::min_parallel 8; 3664 IO::AIO::min_parallel 8;
3203 3665
3206 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3207 reentrant => 0, 3669 reentrant => 0,
3208 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3210 poll => 'r', 3672 poll => 'r',
3211 prio => 6, 3673 prio => 0,
3212 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3213 ); 3675 );
3214} 3676}
3215 3677
3216my $_log_backtrace; 3678my $_log_backtrace;
3222 3684
3223 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3687 ++$_log_backtrace;
3226 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3227 my @bt = fork_call { 3691 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3231 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines