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.325 by root, Sat Jul 28 14:32:22 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
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 | logBacktrace, 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";
… …
1041sub object_freezer_save { 1033sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1043 1035
1044 sync_job { 1036 sync_job {
1045 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1048 1041
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1046 close $fh;
1054 1047
1055 if (@$objs) { 1048 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1054 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1056 }
… …
1071 } 1064 }
1072 } else { 1065 } else {
1073 aio_unlink $filename; 1066 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1075 } 1068 }
1076 } 1069 };
1077} 1070}
1078 1071
1079sub object_freezer_as_string { 1072sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1081 1074
… …
1093 or return; 1086 or return;
1094 1087
1095 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1090 or return;
1098 $av = eval { (Storable::thaw $av)->{objs} };
1099 }
1100 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1103 return ($data, $av); 1101 ($data, $av)
1104} 1102}
1105 1103
1106=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1107 1105
1108=over 4 1106=over 4
… …
1186 my ($type, $reply, @payload) = 1184 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1185 "ARRAY" eq ref $msg
1188 ? @$msg 1186 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1188
1189 my @reply;
1190
1191 if (my $cb = $EXTCMD{$type}) { 1191 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1192 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1197 } else { 1198 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1200 }
1200 1201
1201 cf::override; 1202 cf::override;
… …
1291 1292
1292=head3 cf::player 1293=head3 cf::player
1293 1294
1294=over 4 1295=over 4
1295 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1296=item cf::player::find $login 1311=item cf::player::find $login
1297 1312
1298Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1299 1314
1300=cut 1315=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1354
1340 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1343 } 1363 }
1344 } 1364 }
1345} 1365}
1346 1366
… …
1356 1376
1357 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1359 1379
1360 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1361 Coro::cede; 1381 cf::cede_to_tick;
1362} 1382}
1363 1383
1364sub new($) { 1384sub new($) {
1365 my ($login) = @_; 1385 my ($login) = @_;
1366 1386
… …
1370 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1371 1391
1372 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1373 1393
1374 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1375} 1405}
1376 1406
1377=item $pl->quit_character 1407=item $pl->quit_character
1378 1408
1379Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1464 or return [];
1435 1465
1436 my @logins; 1466 my @logins;
1437 1467
1438 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1442 1477
1443 utf8::decode $login; 1478 utf8::decode $login;
1444 push @logins, $login; 1479 push @logins, $login;
1445 } 1480 }
1446 1481
… …
1484sub expand_cfpod { 1519sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1486 1521
1487 # escape & and < 1522 # escape & and <
1488 s/&/&amp;/g; 1523 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1490 1525
1491 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1492 1527
1493 1 while 1528 1 while
1494 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1534 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1501 }ge 1537 }ge
1502 # replace H<hint text> 1538 # replace H<hint text>
… …
1532=cut 1568=cut
1533 1569
1534sub ext_reply($$@) { 1570sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1571 my ($self, $id, @msg) = @_;
1536 1572
1537 if ($self->ns->extcmd == 2) { 1573 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1574}
1545 1575
1546=item $player->ext_msg ($type, @msg) 1576=item $player->ext_msg ($type, @msg)
1547 1577
1548Sends an ext event to the client. 1578Sends an ext event to the client.
… …
1776 1806
1777sub load_header_from($) { 1807sub load_header_from($) {
1778 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1779 1809
1780 utf8::encode $path; 1810 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1786 1819
1787 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1788 1821
1789 1 1822 1
1790} 1823}
… …
1844sub find { 1877sub find {
1845 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1846 1879
1847 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1848 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1850 1884
1851 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1853 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1854 or return; 1890 or return;
1855 1891
1856 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1857 1893
… …
1859 or return; 1895 or return;
1860 1896
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1864 $map->reset; 1902 $map->reset;
1865 undef $guard;
1866 return find $path; 1903 return find $path;
1867 } 1904 }
1868 1905
1869 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1870 } 1907 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1880 1917
1881 my $path = $self->{path}; 1918 my $path = $self->{path};
1882 1919
1883 { 1920 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1885 1922
1923 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1925
1888 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1889 1927
1890 $self->alloc; 1928 $self->alloc;
1891 1929
1892 $self->pre_load; 1930 $self->pre_load;
1893 Coro::cede; 1931 cf::cede_to_tick;
1894 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1896 or return; 1936 or return;
1897 1937
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1900 1940
1901 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1942 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1945 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1906 } 1949 }
1907 } 1950 }
1908 1951
1909 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1910 # now do the right thing for maps 1955 # now do the right thing for maps
1911 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1958 unless $self->difficulty;
1914 Coro::cede; 1959 cf::cede_to_tick;
1915 1960
1916 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1962 $self->decay_objects;
1918 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1919 $self->update_buttons; 1964 $self->update_buttons;
1920 Coro::cede; 1965 cf::cede_to_tick;
1921 $self->set_darkness_map; 1966 $self->set_darkness_map;
1922 Coro::cede; 1967 cf::cede_to_tick;
1923 $self->activate; 1968 $self->activate;
1924 } 1969 }
1925 1970
1926 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1943 1988
1944 $self 1989 $self
1945} 1990}
1946 1991
1947# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1948sub load_diag { 1993sub load_neighbours {
1949 my ($map) = @_; 1994 my ($map) = @_;
1950 1995
1951 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1952 1997
1953 for (0 .. 3) { 1998 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1955 or next; 2000 or next;
1956 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1957 or next; 2002 or next;
1958 $neigh->load; 2003 $neigh->load;
1959 2004
2005 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2008 }
1963 2009
1964 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1966 or next; 2013 or next;
1967 $neigh->load; 2014 $neigh->load;
1968 } 2015 }
1969} 2016}
1970 2017
… …
1975} 2022}
1976 2023
1977sub do_load_sync { 2024sub do_load_sync {
1978 my ($map) = @_; 2025 my ($map) = @_;
1979 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1980 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1981} 2031}
1982 2032
1983our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1985 2035
1986sub find_async { 2036sub find_async {
1987 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1988 2038
1989 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1990 2040
1991 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2043 }
1994 2044
1995 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1996 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1997 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2052 if (my $map = find $k) {
2000 $map->load; 2053 $map->load if $v;
2001 } 2054 }
2002 2055
2003 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
2004 } 2057 }
2005 } 2058 }
2006 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
2007 }; 2060 };
2008 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
… …
2011} 2064}
2012 2065
2013sub save { 2066sub save {
2014 my ($self) = @_; 2067 my ($self) = @_;
2015 2068
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2070
2018 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
2019 2072
2020 return unless $self->dirty; 2073 return unless $self->dirty;
2021 2074
… …
2027 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2028 2081
2029 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2030 2083
2031 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2033 }; 2087 };
2034 2088
2035 if ($uniq) { 2089 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2044 my ($self) = @_; 2098 my ($self) = @_;
2045 2099
2046 # save first because save cedes 2100 # save first because save cedes
2047 $self->save; 2101 $self->save;
2048 2102
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2104
2051 return if $self->players; 2105 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2054 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2113 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2114}
2058 2115
2059sub reset_at { 2116sub reset_at {
2060 my ($self) = @_; 2117 my ($self) = @_;
2061 2118
… …
2093 if $uniq; 2150 if $uniq;
2094 } 2151 }
2095 2152
2096 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2097 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2157 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2158
2102 $self->unlink_save; 2159 $self->unlink_save;
2103 $self->destroy; 2160 $self->destroy;
2104} 2161}
2105 2162
2106my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2107 2164
2108sub nuke { 2165sub nuke {
2109 my ($self) = @_; 2166 my ($self) = @_;
2110 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2111 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2112 2172
2113 $self->unlink_save; 2173 $self->unlink_save;
2114 2174
2115 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2180
2121 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2122 2183
2123 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2124} 2185}
2125 2186
2126=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
… …
2202 2263
2203sub inv_recursive { 2264sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2205} 2266}
2206 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2207package cf; 2296package cf;
2208 2297
2209=back 2298=back
2210 2299
2211=head3 cf::object::player 2300=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2244 } 2333 }
2245 } 2334 }
2246} 2335}
2247 2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
2345}
2346
2248=item $player_object->may ("access") 2347=item $player_object->may ("access")
2249 2348
2250Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2350(e.g. "command_wizcast").
2252 2351
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2332 2431
2333 $map->load; 2432 $map->load;
2334 $map->load_diag; 2433 $map->load_neighbours;
2335 2434
2336 return unless $self->contr->active; 2435 return unless $self->contr->active;
2337 $self->activate_recursive; 2436 $self->activate_recursive;
2338 2437
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2459
2361 $self->enter_link; 2460 $self->enter_link;
2362 2461
2363 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2364 my $map = eval { 2484 my $map = eval {
2365 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2366 2486
2367 if ($map) { 2487 if ($map) {
2368 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2370 } else { 2490 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2492 }
2373 2493
2374 $map 2494 $map
2375 }; 2495 };
2376 2496
… …
2466 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2469 2589
2470 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2471 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2594 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2474 2596
2475 1; 2597 1;
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2632the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2512 2634
2513=cut 2635=cut
2514 2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2515sub cf::client::send_msg { 2658sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2660
2518 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2519 2662
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2522 if (ref $channel) { 2674 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2527 } 2680 }
2528 2681
2529 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2530 } 2683 }
2531 2684
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2704 }
2552 2705
2553 $color &= cf::NDI_COLOR_MASK; 2706 $color &= cf::NDI_COLOR_MASK;
2554 2707
2708 utf8::encode $msg;
2709
2555 if (0 && $msg =~ /\[/) { 2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2713 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2715 $self->send_packet ("drawinfo $color $msg")
2560 } 2716 }
2561 } 2717 }
… …
2569=cut 2725=cut
2570 2726
2571sub cf::client::ext_msg($$@) { 2727sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2728 my ($self, $type, @msg) = @_;
2573 2729
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2730 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2732 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2733 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2753 }
2582} 2754}
2583 2755
2584=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2818 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2819 "ARRAY" eq ref $msg
2648 ? @$msg 2820 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2822
2823 my @reply;
2824
2651 if (my $cb = $EXTICMD{$type}) { 2825 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2826 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2657 } else { 2832 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2834 }
2660 2835
2661 cf::override; 2836 cf::override;
… …
2708our $safe = new Safe "safe"; 2883our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2884our $safe_hole = new Safe::Hole;
2710 2885
2711$SIG{FPE} = 'IGNORE'; 2886$SIG{FPE} = 'IGNORE';
2712 2887
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2888$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math
2890 grepstart grepwhile mapstart mapwhile
2891 sort time
2892));
2714 2893
2715# here we export the classes and methods available to script code 2894# here we export the classes and methods available to script code
2716 2895
2717=pod 2896=pod
2718 2897
2719The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2720 2899
2721 cf::object 2900 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 2901 contr pay_amount pay_player map x y force_find force_add
2723 insert remove 2902 insert remove name archname title slaying race decrease_ob_nr
2724 2903
2725 cf::object::player 2904 cf::object::player
2726 player 2905 player
2727 2906
2728 cf::player 2907 cf::player
… …
2733 2912
2734=cut 2913=cut
2735 2914
2736for ( 2915for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race
2738 insert remove)], 2918 decrease_ob_nr)],
2739 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2742) { 2922) {
2743 no strict 'refs'; 2923 no strict 'refs';
… …
2819# the server's init and main functions 2999# the server's init and main functions
2820 3000
2821sub load_facedata($) { 3001sub load_facedata($) {
2822 my ($path) = @_; 3002 my ($path) = @_;
2823 3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009
2824 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2825 3011
2826 my $facedata; 3012 my $facedata;
2827 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 3014 or die "$path: $!";
2829 3015
2830 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2831 3017
2832 $facedata->{version} == 2 3018 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3019 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020
3021 # patch in the exptable
3022 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3025 };
3026 cf::cede_to_tick;
2834 3027
2835 { 3028 {
2836 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2837 3030
2838 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 3033 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3034 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3037
2845 cf::cede_to_tick; 3038 cf::cede_to_tick;
2846 } 3039 }
2847 3040
2848 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
… …
2873 3066
2874 { 3067 {
2875 # TODO: for gcfclient pleasure, we should give resources 3068 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3069 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3070 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 3071
2880 my $soundconf = delete $res->{"res/sound.conf"}; 3072 my $soundconf = delete $res->{"res/sound.conf"};
2881 3073
2882 while (my ($name, $info) = each %$res) { 3074 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
2889 3077
2890 if ($info->{type} & 1) { 3078 if ($info->{type} & 1) {
2891 # prepend meta info 3079 # prepend meta info
2892 3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3086 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else { 3087 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3088 $data = $info->{data};
2899 } 3089 }
2900 3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 3092 cf::face::set_type $idx, $info->{type};
2902 3093
2903 cf::cede_to_tick; 3094 cf::cede_to_tick;
2904 } 3095 }
2905 3096
… …
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_] 3101 my $sound = $soundconf->{compat}[$_]
2911 or next; 3102 or next;
2912 3103
2913 my $face = cf::face::find "sound/$sound->[1]"; 3104 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face; 3105 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 } 3107 }
2918 3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
2919 #TODO 3112 }
2920 } 3113 }
2921 } 3114 }
2922 3115
2923 1 3116 1
2924} 3117}
… …
2930 $ns->fx_want ($k, $v); 3123 $ns->fx_want ($k, $v);
2931 } 3124 }
2932}; 3125};
2933 3126
2934sub reload_regions { 3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2935 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2937 3134
2938 for (cf::region::list) { 3135 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
… …
2975 3172
2976sub init { 3173sub init {
2977 reload_resources; 3174 reload_resources;
2978} 3175}
2979 3176
2980sub cfg_load { 3177sub reload_config {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3179 or return;
2983 3180
2984 local $/; 3181 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
… …
3001sub main { 3198sub main {
3002 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
3003 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
3004 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3005 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
3006 Event::one_event; 3204 Event::one_event;
3007 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3008 }; 3206 };
3009 3207
3010 cfg_load; 3208 reload_config;
3011 db_init; 3209 db_init;
3012 load_extensions; 3210 load_extensions;
3013 3211
3014 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
3015 Event::loop; 3213 Event::loop;
… …
3082 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
3083 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
3084 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
3085 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
3086 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save};
3087 $pl->save; 3286 $pl->save;
3088 } 3287 }
3089 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
3090 3289
3091 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
… …
3208 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3209 require cf; 3408 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211 3410
3212 warn "loading config and database again"; 3411 warn "loading config and database again";
3213 cf::cfg_load; 3412 cf::reload_config;
3214 3413
3215 warn "loading extensions"; 3414 warn "loading extensions";
3216 cf::load_extensions; 3415 cf::load_extensions;
3217 3416
3218 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
… …
3254register_command "reload" => sub { 3453register_command "reload" => sub {
3255 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3256 3455
3257 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3258 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3259 async { reload_perl }; 3460 reload_perl;
3461 };
3260 } 3462 }
3261}; 3463};
3262 3464
3263unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3264 3466
… …
3283 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait; 3487 $signal->wait;
3286} 3488}
3287 3489
3288 my $min = 1e6;#d#
3289 my $avg = 10;
3290$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3291 reentrant => 0, 3491 reentrant => 0,
3292 parked => 1, 3492 parked => 1,
3293 prio => 0, 3493 prio => 0,
3294 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
… …
3302 3502
3303 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3304 3504
3305 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3306 3506
3307 0 && sync_job {#d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 };
3329
3330 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3331 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3332 3509
3333 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3335 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3336 write_runtime 3514 write_runtime
3337 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3338 }; 3516 };
3339 } 3517 }
3340 3518
3341# my $AFTER = Event::time;
3342# warn $AFTER - $NOW;#d#
3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send; 3520 $sig->send;
3346 } 3521 }
3347 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send; 3523 $sig->send;
… …
3358 3533
3359 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361 3536
3362 _post_tick; 3537 _post_tick;
3363
3364
3365 }, 3538 },
3366); 3539);
3367 3540
3368{ 3541{
3542 BDB::min_parallel 8;
3369 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3370 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3371 reentrant => 0, 3545 reentrant => 0,
3372 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3373 poll => 'r', 3547 poll => 'r',
3374 prio => 0, 3548 prio => 0,
3375 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3376 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3377 ); 3551 );
3378 BDB::min_parallel 8;
3379 3552
3380 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3381 my $status; 3554 my $status;
3382 my $current = $Coro::current; 3555 my $current = $Coro::current;
3383 ( 3556 (
… …
3392 ) 3565 )
3393 }; 3566 };
3394 3567
3395 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3396 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3397 3574
3398 cf::sync_job { 3575 cf::sync_job {
3399 eval { 3576 eval {
3400 BDB::db_env_open 3577 BDB::db_env_open
3401 $DB_ENV, 3578 $DB_ENV,
… …
3403 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405 0666; 3582 0666;
3406 3583
3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408
3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3410 $DB_ENV->set_lk_detect;
3411 }; 3585 };
3412 3586
3413 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3414 }; 3588 };
3415 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3416} 3621}
3417 3622
3418{ 3623{
3419 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3420 3625
… …
3423 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3424 reentrant => 0, 3629 reentrant => 0,
3425 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3426 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3427 poll => 'r', 3632 poll => 'r',
3428 prio => 6, 3633 prio => 0,
3429 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3430 ); 3635 );
3431} 3636}
3432 3637
3433my $_log_backtrace; 3638my $_log_backtrace;
… …
3439 3644
3440 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3441 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3442 ++$_log_backtrace; 3647 ++$_log_backtrace;
3443 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3444 my @bt = fork_call { 3651 my @bt = fork_call {
3445 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3446 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3447 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3448 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

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