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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock 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
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return 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.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 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#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
340our @SLOT_QUEUE; 354our @SLOT_QUEUE;
341our $SLOT_QUEUE; 355our $SLOT_QUEUE;
342 356
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
345 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
346 362
347 while () { 363 while () {
348 next_job: 364 next_job:
349 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
357 } 373 }
358 } 374 }
359 } 375 }
360 376
361 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 380 $signal->wait;
365 } else { 381 } else {
366 Coro::schedule; 382 Coro::schedule;
367 } 383 }
… …
411 my $time = Event::time; 427 my $time = Event::time;
412 428
413 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
415 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
416 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 435 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
419 437
420 my $busy = 1; 438 my $busy = 1;
421 my @res; 439 my @res;
422 440
423 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 443 @res = eval { $job->() };
425 warn $@ if $@; 444 warn $@ if $@;
426 undef $busy; 445 undef $busy;
427 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
428 447
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
474 493
475=cut 494=cut
476 495
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 496sub fork_call(&@) {
487 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
488 498
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 502
494 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 504 reset_signals;
508 local $SIG{__WARN__}; 505 &$cb
509 local $SIG{__DIE__}; 506 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 507
516 eval { 508 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 509}
529 510
530=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
531 512
532Returns a single value from the environment database. 513Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
535 516
536Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
539=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
540 543
541our $DB; 544our $DB;
542 545
543sub db_init { 546sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 547 cf::sync_job {
548 eval { 548 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 549 };
558} 550}
559 551
560sub db_get($$) { 552sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
562 554
… …
612 if (1) { 604 if (1) {
613 $md5 = 605 $md5 =
614 join "\x00", 606 join "\x00",
615 $processversion, 607 $processversion,
616 map { 608 map {
617 Coro::cede; 609 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 611 } 0.. $#$src;
620 612
621 613
622 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
979# 971#
980 972
981sub _can_merge { 973sub _can_merge {
982 my ($ob1, $ob2) = @_; 974 my ($ob1, $ob2) = @_;
983 975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
984 local $Storable::canonical = 1; 981 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1; 982 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2; 983 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2 984 $fob1 eq $fob2
985 }
989} 986}
990 987
991sub reattach { 988sub reattach {
992 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 990 my ($obj) = @_;
… …
1041sub object_freezer_save { 1038sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
1043 1040
1044 sync_job { 1041 sync_job {
1045 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
1048 1046
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1051 close $fh;
1054 1052
1055 if (@$objs) { 1053 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1059 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1061 }
… …
1071 } 1069 }
1072 } else { 1070 } else {
1073 aio_unlink $filename; 1071 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
1075 } 1073 }
1076 } 1074 };
1077} 1075}
1078 1076
1079sub object_freezer_as_string { 1077sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
1081 1079
… …
1093 or return; 1091 or return;
1094 1092
1095 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1095 or return;
1098 $av = eval { (Storable::thaw $av)->{objs} };
1099 }
1100 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
1103 return ($data, $av); 1106 ($data, $av)
1104} 1107}
1105 1108
1106=head2 COMMAND CALLBACKS 1109=head2 COMMAND CALLBACKS
1107 1110
1108=over 4 1111=over 4
… …
1186 my ($type, $reply, @payload) = 1189 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1190 "ARRAY" eq ref $msg
1188 ? @$msg 1191 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1193
1194 my @reply;
1195
1191 if (my $cb = $EXTCMD{$type}) { 1196 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1197 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
1197 } else { 1203 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1205 }
1200 1206
1201 cf::override; 1207 cf::override;
… …
1291 1297
1292=head3 cf::player 1298=head3 cf::player
1293 1299
1294=over 4 1300=over 4
1295 1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1315
1296=item cf::player::find $login 1316=item cf::player::find $login
1297 1317
1298Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1299 1319
1300=cut 1320=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1359
1340 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1343 } 1368 }
1344 } 1369 }
1345} 1370}
1346 1371
… …
1356 1381
1357 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1359 1384
1360 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1361 Coro::cede; 1386 cf::cede_to_tick;
1362} 1387}
1363 1388
1364sub new($) { 1389sub new($) {
1365 my ($login) = @_; 1390 my ($login) = @_;
1366 1391
… …
1444 or return []; 1469 or return [];
1445 1470
1446 my @logins; 1471 my @logins;
1447 1472
1448 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1452 1482
1453 utf8::decode $login; 1483 utf8::decode $login;
1454 push @logins, $login; 1484 push @logins, $login;
1455 } 1485 }
1456 1486
… …
1494sub expand_cfpod { 1524sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1525 ((my $self), (local $_)) = @_;
1496 1526
1497 # escape & and < 1527 # escape & and <
1498 s/&/&amp;/g; 1528 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1529 s/(?<![BIUGHT])</&lt;/g;
1500 1530
1501 # this is buggy, it needs to properly take care of nested <'s 1531 # this is buggy, it needs to properly take care of nested <'s
1502 1532
1503 1 while 1533 1 while
1504 # replace B<>, I<>, U<> etc. 1534 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1535 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1539 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1540 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1541 $self->gender ? $2 : $1
1511 }ge 1542 }ge
1512 # replace H<hint text> 1543 # replace H<hint text>
… …
1542=cut 1573=cut
1543 1574
1544sub ext_reply($$@) { 1575sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1576 my ($self, $id, @msg) = @_;
1546 1577
1547 if ($self->ns->extcmd == 2) { 1578 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1579}
1555 1580
1556=item $player->ext_msg ($type, @msg) 1581=item $player->ext_msg ($type, @msg)
1557 1582
1558Sends an ext event to the client. 1583Sends an ext event to the client.
… …
1786 1811
1787sub load_header_from($) { 1812sub load_header_from($) {
1788 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1789 1814
1790 utf8::encode $path; 1815 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1796 1824
1797 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1798 1826
1799 1 1827 1
1800} 1828}
… …
1854sub find { 1882sub find {
1855 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1856 1884
1857 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1858 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1860 1889
1861 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1863 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1864 or return; 1895 or return;
1865 1896
1866 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1867 1898
… …
1869 or return; 1900 or return;
1870 1901
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1874 $map->reset; 1907 $map->reset;
1875 undef $guard;
1876 return find $path; 1908 return find $path;
1877 } 1909 }
1878 1910
1879 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1880 } 1912 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1890 1922
1891 my $path = $self->{path}; 1923 my $path = $self->{path};
1892 1924
1893 { 1925 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1895 1927
1928 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1930
1898 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1899 1932
1900 $self->alloc; 1933 $self->alloc;
1901 1934
1902 $self->pre_load; 1935 $self->pre_load;
1903 Coro::cede; 1936 cf::cede_to_tick;
1904 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1906 or return; 1941 or return;
1907 1942
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1910 1945
1911 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1947 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1950 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1916 } 1954 }
1917 } 1955 }
1918 1956
1919 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1920 # now do the right thing for maps 1960 # now do the right thing for maps
1921 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1963 unless $self->difficulty;
1924 Coro::cede; 1964 cf::cede_to_tick;
1925 1965
1926 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1967 $self->decay_objects;
1928 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1929 $self->update_buttons; 1969 $self->update_buttons;
1930 Coro::cede; 1970 cf::cede_to_tick;
1931 $self->set_darkness_map; 1971 $self->set_darkness_map;
1932 Coro::cede; 1972 cf::cede_to_tick;
1933 $self->activate; 1973 $self->activate;
1934 } 1974 }
1935 1975
1936 $self->{last_save} = $cf::RUNTIME; 1976 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1977 $self->last_access ($cf::RUNTIME);
… …
1953 1993
1954 $self 1994 $self
1955} 1995}
1956 1996
1957# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1998sub load_neighbours {
1959 my ($map) = @_; 1999 my ($map) = @_;
1960 2000
1961 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1962 2002
1963 for (0 .. 3) { 2003 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1965 or next; 2005 or next;
1966 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1967 or next; 2007 or next;
1968 $neigh->load; 2008 $neigh->load;
1969 2009
2010 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2013 }
1973 2014
1974 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1976 or next; 2018 or next;
1977 $neigh->load; 2019 $neigh->load;
1978 } 2020 }
1979} 2021}
1980 2022
… …
1985} 2027}
1986 2028
1987sub do_load_sync { 2029sub do_load_sync {
1988 my ($map) = @_; 2030 my ($map) = @_;
1989 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1990 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1991} 2036}
1992 2037
1993our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1995 2040
1996sub find_async { 2041sub find_async {
1997 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1998 2043
1999 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
2000 2045
2001 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2048 }
2004 2049
2005 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
2006 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
2007 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2057 if (my $map = find $k) {
2010 $map->load; 2058 $map->load if $v;
2011 } 2059 }
2012 2060
2013 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
2014 } 2062 }
2015 } 2063 }
2016 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
2017 }; 2065 };
2018 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
… …
2021} 2069}
2022 2070
2023sub save { 2071sub save {
2024 my ($self) = @_; 2072 my ($self) = @_;
2025 2073
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2075
2028 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
2029 2077
2030 return unless $self->dirty; 2078 return unless $self->dirty;
2031 2079
… …
2037 return if $self->{deny_save}; 2085 return if $self->{deny_save};
2038 2086
2039 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
2040 2088
2041 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
2043 }; 2092 };
2044 2093
2045 if ($uniq) { 2094 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2054 my ($self) = @_; 2103 my ($self) = @_;
2055 2104
2056 # save first because save cedes 2105 # save first because save cedes
2057 $self->save; 2106 $self->save;
2058 2107
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2109
2061 return if $self->players; 2110 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2112 return if $self->{deny_save};
2064 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2118 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2119}
2068 2120
2069sub reset_at { 2121sub reset_at {
2070 my ($self) = @_; 2122 my ($self) = @_;
2071 2123
… …
2103 if $uniq; 2155 if $uniq;
2104 } 2156 }
2105 2157
2106 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
2107 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2162 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2163
2112 $self->unlink_save; 2164 $self->unlink_save;
2113 $self->destroy; 2165 $self->destroy;
2114} 2166}
2115 2167
2116my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
2117 2169
2118sub nuke { 2170sub nuke {
2119 my ($self) = @_; 2171 my ($self) = @_;
2120 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
2121 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
2122 2177
2123 $self->unlink_save; 2178 $self->unlink_save;
2124 2179
2125 bless $self, "cf::map"; 2180 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2185
2131 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
2132 2188
2133 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2134} 2190}
2135 2191
2136=item $maps = cf::map::tmp_maps 2192=item $maps = cf::map::tmp_maps
… …
2212 2268
2213sub inv_recursive { 2269sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2215} 2271}
2216 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
2217package cf; 2301package cf;
2218 2302
2219=back 2303=back
2220 2304
2221=head3 cf::object::player 2305=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
2352 2436
2353 $map->load; 2437 $map->load;
2354 $map->load_diag; 2438 $map->load_neighbours;
2355 2439
2356 return unless $self->contr->active; 2440 return unless $self->contr->active;
2357 $self->activate_recursive; 2441 $self->activate_recursive;
2358 2442
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2464
2381 $self->enter_link; 2465 $self->enter_link;
2382 2466
2383 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2384 my $map = eval { 2489 my $map = eval {
2385 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2386 2491
2387 if ($map) { 2492 if ($map) {
2388 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2390 } else { 2495 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2497 }
2393 2498
2394 $map 2499 $map
2395 }; 2500 };
2396 2501
… …
2486 # if exit is damned, update players death & WoR home-position 2591 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2592 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2593 if $exit->flag (FLAG_DAMNED);
2489 2594
2490 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2491 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2599 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2494 2601
2495 1; 2602 1;
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2637the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2638the message unless the client supports the msg packet.
2532 2639
2533=cut 2640=cut
2534 2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2535sub cf::client::send_msg { 2663sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2665
2538 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2539 2667
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2542 if (ref $channel) { 2679 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2680 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2681 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2682 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2547 } 2685 }
2548 2686
2549 $channel = $channel->{id}; 2687 $channel = $channel->{id};
2550 } 2688 }
2551 2689
… …
2573 $color &= cf::NDI_COLOR_MASK; 2711 $color &= cf::NDI_COLOR_MASK;
2574 2712
2575 utf8::encode $msg; 2713 utf8::encode $msg;
2576 2714
2577 if (0 && $msg =~ /\[/) { 2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2718 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2720 $self->send_packet ("drawinfo $color $msg")
2582 } 2721 }
2583 } 2722 }
… …
2591=cut 2730=cut
2592 2731
2593sub cf::client::ext_msg($$@) { 2732sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2733 my ($self, $type, @msg) = @_;
2595 2734
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2735 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2737 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2738 push @msg, msgtype => "event_$type";
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2758 }
2604} 2759}
2605 2760
2606=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
… …
2668 my ($type, $reply, @payload) = 2823 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 2824 "ARRAY" eq ref $msg
2670 ? @$msg 2825 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 2827
2828 my @reply;
2829
2673 if (my $cb = $EXTICMD{$type}) { 2830 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 2831 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2679 } else { 2837 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 2839 }
2682 2840
2683 cf::override; 2841 cf::override;
… …
2743=pod 2901=pod
2744 2902
2745The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2746 2904
2747 cf::object 2905 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 2906 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove 2907 insert remove name archname title slaying race decrease_ob_nr
2750 2908
2751 cf::object::player 2909 cf::object::player
2752 player 2910 player
2753 2911
2754 cf::player 2912 cf::player
… …
2759 2917
2760=cut 2918=cut
2761 2919
2762for ( 2920for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv)], 2922 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)],
2765 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2768) { 2927) {
2769 no strict 'refs'; 2928 no strict 'refs';
… …
2845# the server's init and main functions 3004# the server's init and main functions
2846 3005
2847sub load_facedata($) { 3006sub load_facedata($) {
2848 my ($path) = @_; 3007 my ($path) = @_;
2849 3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3014
2850 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2851 3016
2852 my $facedata; 3017 my $facedata;
2853 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3019 or die "$path: $!";
2855 3020
2856 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2857 3022
2858 $facedata->{version} == 2 3023 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
2860 3032
2861 { 3033 {
2862 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2863 3035
2864 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2866 cf::face::set_visibility $idx, $info->{visibility}; 3038 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3039 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3042
2871 cf::cede_to_tick; 3043 cf::cede_to_tick;
2872 } 3044 }
2873 3045
2874 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
… …
2899 3071
2900 { 3072 {
2901 # TODO: for gcfclient pleasure, we should give resources 3073 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3074 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3075 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905 3076
2906 my $soundconf = delete $res->{"res/sound.conf"}; 3077 my $soundconf = delete $res->{"res/sound.conf"};
2907 3078
2908 while (my ($name, $info) = each %$res) { 3079 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
2915 3082
2916 if ($info->{type} & 1) { 3083 if ($info->{type} & 1) {
2917 # prepend meta info 3084 # prepend meta info
2918 3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3091 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2921
2922 cf::face::set_data $idx, 0, $data, $chk;
2923 } else { 3092 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3093 $data = $info->{data};
2925 } 3094 }
2926 3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2927 cf::face::set_type $idx, $info->{type}; 3097 cf::face::set_type $idx, $info->{type};
2928 3098
2929 cf::cede_to_tick; 3099 cf::cede_to_tick;
2930 } 3100 }
2931 3101
… …
2958 $ns->fx_want ($k, $v); 3128 $ns->fx_want ($k, $v);
2959 } 3129 }
2960}; 3130};
2961 3131
2962sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2963 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
2965 3139
2966 for (cf::region::list) { 3140 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3141 $_->{match} = qr/$_->{match}/
… …
3003 3177
3004sub init { 3178sub init {
3005 reload_resources; 3179 reload_resources;
3006} 3180}
3007 3181
3008sub cfg_load { 3182sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3184 or return;
3011 3185
3012 local $/; 3186 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
… …
3029sub main { 3203sub main {
3030 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
3034 Event::one_event; 3209 Event::one_event;
3035 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
3036 }; 3211 };
3037 3212
3038 cfg_load; 3213 reload_config;
3039 db_init; 3214 db_init;
3040 load_extensions; 3215 load_extensions;
3041 3216
3042 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
3043 Event::loop; 3218 Event::loop;
… …
3110 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3291 $pl->save;
3116 } 3292 }
3117 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
3118 3294
3119 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
… …
3236 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
3237 require cf; 3413 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3415
3240 warn "loading config and database again"; 3416 warn "loading config and database again";
3241 cf::cfg_load; 3417 cf::reload_config;
3242 3418
3243 warn "loading extensions"; 3419 warn "loading extensions";
3244 cf::load_extensions; 3420 cf::load_extensions;
3245 3421
3246 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
… …
3282register_command "reload" => sub { 3458register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3284 3460
3285 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3465 reload_perl;
3466 };
3288 } 3467 }
3289}; 3468};
3290 3469
3291unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3292 3471
… …
3311 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3492 $signal->wait;
3314} 3493}
3315 3494
3316 my $min = 1e6;#d#
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3319 reentrant => 0, 3496 reentrant => 0,
3320 parked => 1, 3497 parked => 1,
3321 prio => 0, 3498 prio => 0,
3322 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
… …
3330 3507
3331 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3332 3509
3333 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3334 3511
3335 0 && sync_job {#d#
3336 for(1..10) {
3337 my $t = Event::time;
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3339 or die;
3340
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 };
3357
3358 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3360 3514
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3364 write_runtime 3519 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3366 }; 3521 };
3367 } 3522 }
3368 3523
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3525 $sig->send;
3374 } 3526 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3528 $sig->send;
… …
3386 3538
3387 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3541
3390 _post_tick; 3542 _post_tick;
3391
3392
3393 }, 3543 },
3394); 3544);
3395 3545
3396{ 3546{
3547 BDB::min_parallel 8;
3397 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
3398 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
3399 reentrant => 0, 3550 reentrant => 0,
3400 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
3401 poll => 'r', 3552 poll => 'r',
3402 prio => 0, 3553 prio => 0,
3403 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3405 ); 3556 );
3406 BDB::min_parallel 8;
3407 3557
3408 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3409 my $status; 3559 my $status;
3410 my $current = $Coro::current; 3560 my $current = $Coro::current;
3411 ( 3561 (
… …
3420 ) 3570 )
3421 }; 3571 };
3422 3572
3423 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3579
3426 cf::sync_job { 3580 cf::sync_job {
3427 eval { 3581 eval {
3428 BDB::db_env_open 3582 BDB::db_env_open
3429 $DB_ENV, 3583 $DB_ENV,
… …
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3587 0666;
3434 3588
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3590 };
3440 3591
3441 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3593 };
3443 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3444} 3626}
3445 3627
3446{ 3628{
3447 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3448 3630
… …
3451 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3452 reentrant => 0, 3634 reentrant => 0,
3453 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3455 poll => 'r', 3637 poll => 'r',
3456 prio => 6, 3638 prio => 0,
3457 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3458 ); 3640 );
3459} 3641}
3460 3642
3461my $_log_backtrace; 3643my $_log_backtrace;
… …
3467 3649
3468 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3652 ++$_log_backtrace;
3471 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3472 my @bt = fork_call { 3656 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines