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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines