ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 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
429 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
430 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
431 } 454 }
432 455
433 $time = Event::time - $time; 456 $time = Event::time - $time;
434 457
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
474 497
475=cut 498=cut
476 499
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(&@) { 500sub fork_call(&@) {
487 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
488 502
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 506
494 if (my $pid = fork) { 507 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; 508 reset_signals;
508 local $SIG{__WARN__}; 509 &$cb
509 local $SIG{__DIE__}; 510 }, @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 511
516 eval { 512 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} 513}
529 514
530=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
531 516
532Returns a single value from the environment database. 517Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
535 520
536Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
539=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
540 547
541our $DB; 548our $DB;
542 549
543sub db_init { 550sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 551 cf::sync_job {
548 eval { 552 $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 } 553 };
558} 554}
559 555
560sub db_get($$) { 556sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
562 558
… …
612 if (1) { 608 if (1) {
613 $md5 = 609 $md5 =
614 join "\x00", 610 join "\x00",
615 $processversion, 611 $processversion,
616 map { 612 map {
617 Coro::cede; 613 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 615 } 0.. $#$src;
620 616
621 617
622 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
… …
974 970
975=cut 971=cut
976 972
977############################################################################# 973#############################################################################
978# object support 974# object support
979#
980 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
981sub _can_merge { 1009sub _can_merge {
982 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
983 1011
984 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1013
988 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
989} 1016}
990 1017
991sub reattach { 1018sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1041sub object_freezer_save { 1068sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1043 1070
1044 sync_job { 1071 sync_job {
1045 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1048 1076
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1081 close $fh;
1054 1082
1055 if (@$objs) { 1083 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1089 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1091 }
… …
1071 } 1099 }
1072 } else { 1100 } else {
1073 aio_unlink $filename; 1101 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1075 } 1103 }
1076 } 1104 };
1077} 1105}
1078 1106
1079sub object_freezer_as_string { 1107sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1081 1109
… …
1093 or return; 1121 or return;
1094 1122
1095 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1125 or return;
1126
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1099 } 1129 }
1100 1130
1131 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1103 return ($data, $av); 1135 ($data, $av)
1104} 1136}
1105 1137
1106=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1107 1139
1108=over 4 1140=over 4
… …
1186 my ($type, $reply, @payload) = 1218 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1219 "ARRAY" eq ref $msg
1188 ? @$msg 1220 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1222
1223 my @reply;
1224
1191 if (my $cb = $EXTCMD{$type}) { 1225 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1226 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1197 } else { 1232 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1234 }
1200 1235
1201 cf::override; 1236 cf::override;
… …
1291 1326
1292=head3 cf::player 1327=head3 cf::player
1293 1328
1294=over 4 1329=over 4
1295 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1296=item cf::player::find $login 1345=item cf::player::find $login
1297 1346
1298Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1299 1348
1300=cut 1349=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1388
1340 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1343 } 1397 }
1344 } 1398 }
1345} 1399}
1346 1400
… …
1356 1410
1357 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1359 1413
1360 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1361 Coro::cede; 1415 cf::cede_to_tick;
1362} 1416}
1363 1417
1364sub new($) { 1418sub new($) {
1365 my ($login) = @_; 1419 my ($login) = @_;
1366 1420
… …
1444 or return []; 1498 or return [];
1445 1499
1446 my @logins; 1500 my @logins;
1447 1501
1448 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1452 1511
1453 utf8::decode $login; 1512 utf8::decode $login;
1454 push @logins, $login; 1513 push @logins, $login;
1455 } 1514 }
1456 1515
… …
1494sub expand_cfpod { 1553sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1496 1555
1497 # escape & and < 1556 # escape & and <
1498 s/&/&amp;/g; 1557 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1500 1559
1501 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1502 1561
1503 1 while 1562 1 while
1504 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1568 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1511 }ge 1571 }ge
1512 # replace H<hint text> 1572 # replace H<hint text>
… …
1542=cut 1602=cut
1543 1603
1544sub ext_reply($$@) { 1604sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1605 my ($self, $id, @msg) = @_;
1546 1606
1547 if ($self->ns->extcmd == 2) { 1607 $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} 1608}
1555 1609
1556=item $player->ext_msg ($type, @msg) 1610=item $player->ext_msg ($type, @msg)
1557 1611
1558Sends an ext event to the client. 1612Sends an ext event to the client.
… …
1786 1840
1787sub load_header_from($) { 1841sub load_header_from($) {
1788 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1789 1843
1790 utf8::encode $path; 1844 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1796 1853
1797 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1798 1855
1799 1 1856 1
1800} 1857}
… …
1854sub find { 1911sub find {
1855 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1856 1913
1857 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1858 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1860 1918
1861 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1863 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1864 or return; 1924 or return;
1865 1925
1866 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1867 1927
… …
1869 or return; 1929 or return;
1870 1930
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1874 $map->reset; 1936 $map->reset;
1875 undef $guard;
1876 return find $path; 1937 return find $path;
1877 } 1938 }
1878 1939
1879 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1880 } 1941 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1890 1951
1891 my $path = $self->{path}; 1952 my $path = $self->{path};
1892 1953
1893 { 1954 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1895 1956
1957 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1959
1898 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1899 1961
1900 $self->alloc; 1962 $self->alloc;
1901 1963
1902 $self->pre_load; 1964 $self->pre_load;
1903 Coro::cede; 1965 cf::cede_to_tick;
1904 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1906 or return; 1970 or return;
1907 1971
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1910 1974
1911 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1976 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1979 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1916 } 1983 }
1917 } 1984 }
1918 1985
1919 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1920 # now do the right thing for maps 1989 # now do the right thing for maps
1921 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1992 unless $self->difficulty;
1924 Coro::cede; 1993 cf::cede_to_tick;
1925 1994
1926 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1996 $self->decay_objects;
1928 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1929 $self->update_buttons; 1998 $self->update_buttons;
1930 Coro::cede; 1999 cf::cede_to_tick;
1931 $self->set_darkness_map; 2000 $self->set_darkness_map;
1932 Coro::cede; 2001 cf::cede_to_tick;
1933 $self->activate; 2002 $self->activate;
1934 } 2003 }
1935 2004
1936 $self->{last_save} = $cf::RUNTIME; 2005 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2006 $self->last_access ($cf::RUNTIME);
… …
1953 2022
1954 $self 2023 $self
1955} 2024}
1956 2025
1957# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2027sub load_neighbours {
1959 my ($map) = @_; 2028 my ($map) = @_;
1960 2029
1961 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1962 2031
1963 for (0 .. 3) { 2032 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1965 or next; 2034 or next;
1966 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1967 or next; 2036 or next;
1968 $neigh->load; 2037 $neigh->load;
1969 2038
2039 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2042 }
1973 2043
1974 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1976 or next; 2047 or next;
1977 $neigh->load; 2048 $neigh->load;
1978 } 2049 }
1979} 2050}
1980 2051
… …
1985} 2056}
1986 2057
1987sub do_load_sync { 2058sub do_load_sync {
1988 my ($map) = @_; 2059 my ($map) = @_;
1989 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1990 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1991} 2065}
1992 2066
1993our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1995 2069
1996sub find_async { 2070sub find_async {
1997 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1998 2072
1999 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
2000 2074
2001 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2077 }
2004 2078
2005 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
2006 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
2007 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2086 if (my $map = find $k) {
2010 $map->load; 2087 $map->load if $v;
2011 } 2088 }
2012 2089
2013 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
2014 } 2091 }
2015 } 2092 }
2016 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
2017 }; 2094 };
2018 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
… …
2021} 2098}
2022 2099
2023sub save { 2100sub save {
2024 my ($self) = @_; 2101 my ($self) = @_;
2025 2102
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2104
2028 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2029 2106
2030 return unless $self->dirty; 2107 return unless $self->dirty;
2031 2108
… …
2037 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2038 2115
2039 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2040 2117
2041 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2043 }; 2121 };
2044 2122
2045 if ($uniq) { 2123 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2054 my ($self) = @_; 2132 my ($self) = @_;
2055 2133
2056 # save first because save cedes 2134 # save first because save cedes
2057 $self->save; 2135 $self->save;
2058 2136
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2138
2061 return if $self->players; 2139 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2141 return if $self->{deny_save};
2064 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2147 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2148}
2068 2149
2069sub reset_at { 2150sub reset_at {
2070 my ($self) = @_; 2151 my ($self) = @_;
2071 2152
… …
2103 if $uniq; 2184 if $uniq;
2104 } 2185 }
2105 2186
2106 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2107 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2191 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2192
2112 $self->unlink_save; 2193 $self->unlink_save;
2113 $self->destroy; 2194 $self->destroy;
2114} 2195}
2115 2196
2116my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2117 2198
2118sub nuke { 2199sub nuke {
2119 my ($self) = @_; 2200 my ($self) = @_;
2120 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2121 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2122 2206
2123 $self->unlink_save; 2207 $self->unlink_save;
2124 2208
2125 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2214
2131 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2132 2217
2133 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2134} 2219}
2135 2220
2136=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
… …
2212 2297
2213sub inv_recursive { 2298sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2215} 2300}
2216 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2217package cf; 2330package cf;
2218 2331
2219=back 2332=back
2220 2333
2221=head3 cf::object::player 2334=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2352 2465
2353 $map->load; 2466 $map->load;
2354 $map->load_diag; 2467 $map->load_neighbours;
2355 2468
2356 return unless $self->contr->active; 2469 return unless $self->contr->active;
2357 $self->activate_recursive; 2470 $self->activate_recursive;
2358 2471
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2493
2381 $self->enter_link; 2494 $self->enter_link;
2382 2495
2383 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2384 my $map = eval { 2518 my $map = eval {
2385 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2386 2520
2387 if ($map) { 2521 if ($map) {
2388 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2390 } else { 2524 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2526 }
2393 2527
2394 $map 2528 $map
2395 }; 2529 };
2396 2530
… …
2486 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2489 2623
2490 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2491 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2628 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2494 2630
2495 1; 2631 1;
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2532 2668
2533=cut 2669=cut
2534 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/lookat" => {
2685 id => "infobox",
2686 title => "Look",
2687 reply => undef,
2688 tooltip => "What you saw there",
2689 },
2690);
2691
2535sub cf::client::send_msg { 2692sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2693 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2694
2538 $msg = $self->pl->expand_cfpod ($msg); 2695 $msg = $self->pl->expand_cfpod ($msg);
2539 2696
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2697 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2698
2699 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel};
2702
2703 $self->ext_msg (channel_info => $channel)
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id};
2707
2542 if (ref $channel) { 2708 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2709 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2710 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2711 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2712 $self->ext_msg (channel_info => $channel)
2713 if $self->can_msg;
2547 } 2714 }
2548 2715
2549 $channel = $channel->{id}; 2716 $channel = $channel->{id};
2550 } 2717 }
2551 2718
… …
2592=cut 2759=cut
2593 2760
2594sub cf::client::ext_msg($$@) { 2761sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2762 my ($self, $type, @msg) = @_;
2596 2763
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2764 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2766 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2767 push @msg, msgtype => "event_$type";
2768 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2769 }
2770}
2771
2772=item $client->ext_reply ($msgid, @msg)
2773
2774Sends an ext reply to the client.
2775
2776=cut
2777
2778sub cf::client::ext_reply($$@) {
2779 my ($self, $id, @msg) = @_;
2780
2781 if ($self->extcmd == 2) {
2782 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2783 } elsif ($self->extcmd == 1) {
2784 #TODO: version 1, remove
2785 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2786 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2787 }
2605} 2788}
2606 2789
2607=item $success = $client->query ($flags, "text", \&cb) 2790=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2852 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2853 "ARRAY" eq ref $msg
2671 ? @$msg 2854 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2855 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2856
2857 my @reply;
2858
2674 if (my $cb = $EXTICMD{$type}) { 2859 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2860 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2861 }
2862
2863 $ns->ext_reply ($reply, @reply)
2864 if $reply;
2865
2680 } else { 2866 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2867 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2868 }
2683 2869
2684 cf::override; 2870 cf::override;
… …
2744=pod 2930=pod
2745 2931
2746The following functions and methods are available within a safe environment: 2932The following functions and methods are available within a safe environment:
2747 2933
2748 cf::object 2934 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2935 contr pay_amount pay_player map x y force_find force_add destroy
2750 insert remove name archname title slaying race 2936 insert remove name archname title slaying race decrease_ob_nr
2751 2937
2752 cf::object::player 2938 cf::object::player
2753 player 2939 player
2754 2940
2755 cf::player 2941 cf::player
… …
2760 2946
2761=cut 2947=cut
2762 2948
2763for ( 2949for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2951 insert remove inv name archname title slaying race
2952 decrease_ob_nr destroy)],
2766 ["cf::object::player" => qw(player)], 2953 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2954 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2955 ["cf::map" => qw(trigger)],
2769) { 2956) {
2770 no strict 'refs'; 2957 no strict 'refs';
… …
2846# the server's init and main functions 3033# the server's init and main functions
2847 3034
2848sub load_facedata($) { 3035sub load_facedata($) {
2849 my ($path) = @_; 3036 my ($path) = @_;
2850 3037
3038 # HACK to clear player env face cache, we need some signal framework
3039 # for this (global event?)
3040 %ext::player_env::MUSIC_FACE_CACHE = ();
3041
3042 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3043
2851 warn "loading facedata from $path\n"; 3044 warn "loading facedata from $path\n";
2852 3045
2853 my $facedata; 3046 my $facedata;
2854 0 < aio_load $path, $facedata 3047 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 3048 or die "$path: $!";
2856 3049
2857 $facedata = Coro::Storable::thaw $facedata; 3050 $facedata = Coro::Storable::thaw $facedata;
2858 3051
2859 $facedata->{version} == 2 3052 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3053 or cf::cleanup "$path: version mismatch, cannot proceed.";
3054
3055 # patch in the exptable
3056 $facedata->{resource}{"res/exp_table"} = {
3057 type => FT_RSRC,
3058 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3059 };
3060 cf::cede_to_tick;
2861 3061
2862 { 3062 {
2863 my $faces = $facedata->{faceinfo}; 3063 my $faces = $facedata->{faceinfo};
2864 3064
2865 while (my ($face, $info) = each %$faces) { 3065 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3066 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 3067 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3068 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3071
2872 cf::cede_to_tick; 3072 cf::cede_to_tick;
2873 } 3073 }
2874 3074
2875 while (my ($face, $info) = each %$faces) { 3075 while (my ($face, $info) = each %$faces) {
… …
2900 3100
2901 { 3101 {
2902 # TODO: for gcfclient pleasure, we should give resources 3102 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3103 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3104 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 3105
2907 my $soundconf = delete $res->{"res/sound.conf"}; 3106 my $soundconf = delete $res->{"res/sound.conf"};
2908 3107
2909 while (my ($name, $info) = each %$res) { 3108 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3109 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data;
2916 3111
2917 if ($info->{type} & 1) { 3112 if ($info->{type} & 1) {
2918 # prepend meta info 3113 # prepend meta info
2919 3114
3115 my $meta = $enc->encode ({
3116 name => $name,
3117 %{ $info->{meta} || {} },
3118 });
3119
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3120 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 3121 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3122 $data = $info->{data};
2926 } 3123 }
2927 3124
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 3126 cf::face::set_type $idx, $info->{type};
2929 3127
2930 cf::cede_to_tick; 3128 cf::cede_to_tick;
2931 } 3129 }
2932 3130
… …
2959 $ns->fx_want ($k, $v); 3157 $ns->fx_want ($k, $v);
2960 } 3158 }
2961}; 3159};
2962 3160
2963sub reload_regions { 3161sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = ();
3165
2964 load_resource_file "$MAPDIR/regions" 3166 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3167 or die "unable to load regions file\n";
2966 3168
2967 for (cf::region::list) { 3169 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3170 $_->{match} = qr/$_->{match}/
… …
3004 3206
3005sub init { 3207sub init {
3006 reload_resources; 3208 reload_resources;
3007} 3209}
3008 3210
3009sub cfg_load { 3211sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3212 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3213 or return;
3012 3214
3013 local $/; 3215 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3216 *CFG = YAML::Syck::Load <$fh>;
… …
3030sub main { 3232sub main {
3031 # we must not ever block the main coroutine 3233 # we must not ever block the main coroutine
3032 local $Coro::idle = sub { 3234 local $Coro::idle = sub {
3033 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3034 (async { 3236 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER";
3035 Event::one_event; 3238 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3239 })->prio (Coro::PRIO_MAX);
3037 }; 3240 };
3038 3241
3039 cfg_load; 3242 reload_config;
3040 db_init; 3243 db_init;
3041 load_extensions; 3244 load_extensions;
3042 3245
3043 $TICK_WATCHER->start; 3246 $TICK_WATCHER->start;
3044 Event::loop; 3247 Event::loop;
… …
3111 # and maps saved/destroyed asynchronously. 3314 # and maps saved/destroyed asynchronously.
3112 warn "begin emergency player save\n"; 3315 warn "begin emergency player save\n";
3113 for my $login (keys %cf::PLAYER) { 3316 for my $login (keys %cf::PLAYER) {
3114 my $pl = $cf::PLAYER{$login} or next; 3317 my $pl = $cf::PLAYER{$login} or next;
3115 $pl->valid or next; 3318 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3116 $pl->save; 3320 $pl->save;
3117 } 3321 }
3118 warn "end emergency player save\n"; 3322 warn "end emergency player save\n";
3119 3323
3120 warn "begin emergency map save\n"; 3324 warn "begin emergency map save\n";
… …
3168 3372
3169 warn "flushing outstanding aio requests"; 3373 warn "flushing outstanding aio requests";
3170 for (;;) { 3374 for (;;) {
3171 BDB::flush; 3375 BDB::flush;
3172 IO::AIO::flush; 3376 IO::AIO::flush;
3173 Coro::cede; 3377 Coro::cede_notself;
3174 last unless IO::AIO::nreqs || BDB::nreqs; 3378 last unless IO::AIO::nreqs || BDB::nreqs;
3175 warn "iterate..."; 3379 warn "iterate...";
3176 } 3380 }
3177 3381
3178 ++$RELOAD; 3382 ++$RELOAD;
… …
3237 warn "reloading cf.pm"; 3441 warn "reloading cf.pm";
3238 require cf; 3442 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3444
3241 warn "loading config and database again"; 3445 warn "loading config and database again";
3242 cf::cfg_load; 3446 cf::reload_config;
3243 3447
3244 warn "loading extensions"; 3448 warn "loading extensions";
3245 cf::load_extensions; 3449 cf::load_extensions;
3246 3450
3247 warn "reattaching attachments to objects/players"; 3451 warn "reattaching attachments to objects/players";
… …
3283register_command "reload" => sub { 3487register_command "reload" => sub {
3284 my ($who, $arg) = @_; 3488 my ($who, $arg) = @_;
3285 3489
3286 if ($who->flag (FLAG_WIZ)) { 3490 if ($who->flag (FLAG_WIZ)) {
3287 $who->message ("reloading server."); 3491 $who->message ("reloading server.");
3492 async {
3493 $Coro::current->{desc} = "perl_reload";
3288 async { reload_perl }; 3494 reload_perl;
3495 };
3289 } 3496 }
3290}; 3497};
3291 3498
3292unshift @INC, $LIBDIR; 3499unshift @INC, $LIBDIR;
3293 3500
… …
3312 my $signal = new Coro::Signal; 3519 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3520 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3521 $signal->wait;
3315} 3522}
3316 3523
3317 my $min = 1e6;#d#
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer ( 3524$TICK_WATCHER = Event->timer (
3320 reentrant => 0, 3525 reentrant => 0,
3321 parked => 1, 3526 parked => 1,
3322 prio => 0, 3527 prio => 0,
3323 at => $NEXT_TICK || $TICK, 3528 at => $NEXT_TICK || $TICK,
… …
3331 3536
3332 $NOW = $tick_start = Event::time; 3537 $NOW = $tick_start = Event::time;
3333 3538
3334 cf::server_tick; # one server iteration 3539 cf::server_tick; # one server iteration
3335 3540
3336 0 && sync_job {#d#
3337 for(1..10) {
3338 my $t = Event::time;
3339 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3340 or die;
3341
3342 $map->width (50);
3343 $map->height (50);
3344 $map->alloc;
3345 $map->_load_objects ("/tmp/x.map", 1);
3346 my $t = Event::time - $t;
3347
3348 #next unless $t < 0.0013;#d#
3349 if ($t < $min) {
3350 $min = $t;
3351 }
3352 $avg = $avg * 0.99 + $t * 0.01;
3353 }
3354 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3355 exit 0;
3356 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3357 };
3358
3359 $RUNTIME += $TICK; 3541 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK; 3542 $NEXT_TICK += $TICK;
3361 3543
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3544 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10; 3545 $NEXT_RUNTIME_WRITE = $NOW + 10;
3364 Coro::async_pool { 3546 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver";
3365 write_runtime 3548 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!"; 3549 or warn "ERROR: unable to write runtime file: $!";
3367 }; 3550 };
3368 } 3551 }
3369 3552
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3554 $sig->send;
3375 } 3555 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3556 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3557 $sig->send;
… …
3387 3567
3388 $LOAD = ($NOW - $tick_start) / $TICK; 3568 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3570
3391 _post_tick; 3571 _post_tick;
3392
3393
3394 }, 3572 },
3395); 3573);
3396 3574
3397{ 3575{
3576 BDB::min_parallel 8;
3398 BDB::max_poll_time $TICK * 0.1; 3577 BDB::max_poll_time $TICK * 0.1;
3399 $BDB_POLL_WATCHER = Event->io ( 3578 $BDB_POLL_WATCHER = Event->io (
3400 reentrant => 0, 3579 reentrant => 0,
3401 fd => BDB::poll_fileno, 3580 fd => BDB::poll_fileno,
3402 poll => 'r', 3581 poll => 'r',
3403 prio => 0, 3582 prio => 0,
3404 data => WF_AUTOCANCEL, 3583 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb, 3584 cb => \&BDB::poll_cb,
3406 ); 3585 );
3407 BDB::min_parallel 8;
3408 3586
3409 BDB::set_sync_prepare { 3587 BDB::set_sync_prepare {
3410 my $status; 3588 my $status;
3411 my $current = $Coro::current; 3589 my $current = $Coro::current;
3412 ( 3590 (
… …
3421 ) 3599 )
3422 }; 3600 };
3423 3601
3424 unless ($DB_ENV) { 3602 unless ($DB_ENV) {
3425 $DB_ENV = BDB::db_env_create; 3603 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3605 | BDB::LOG_AUTOREMOVE, 1);
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3426 3608
3427 cf::sync_job { 3609 cf::sync_job {
3428 eval { 3610 eval {
3429 BDB::db_env_open 3611 BDB::db_env_open
3430 $DB_ENV, 3612 $DB_ENV,
… …
3432 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3614 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3615 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3616 0666;
3435 3617
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3618 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3439 $DB_ENV->set_lk_detect;
3440 }; 3619 };
3441 3620
3442 cf::cleanup "db_env_open(db): $@" if $@; 3621 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3622 };
3444 } 3623 }
3624
3625 $BDB_DEADLOCK_WATCHER = Event->timer (
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 );
3635 $BDB_CHECKPOINT_WATCHER = Event->timer (
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 );
3645 $BDB_TRICKLE_WATCHER = Event->timer (
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 );
3445} 3655}
3446 3656
3447{ 3657{
3448 IO::AIO::min_parallel 8; 3658 IO::AIO::min_parallel 8;
3449 3659
… …
3452 $AIO_POLL_WATCHER = Event->io ( 3662 $AIO_POLL_WATCHER = Event->io (
3453 reentrant => 0, 3663 reentrant => 0,
3454 data => WF_AUTOCANCEL, 3664 data => WF_AUTOCANCEL,
3455 fd => IO::AIO::poll_fileno, 3665 fd => IO::AIO::poll_fileno,
3456 poll => 'r', 3666 poll => 'r',
3457 prio => 6, 3667 prio => 0,
3458 cb => \&IO::AIO::poll_cb, 3668 cb => \&IO::AIO::poll_cb,
3459 ); 3669 );
3460} 3670}
3461 3671
3462my $_log_backtrace; 3672my $_log_backtrace;
… …
3468 3678
3469 # limit the # of concurrent backtraces 3679 # limit the # of concurrent backtraces
3470 if ($_log_backtrace < 2) { 3680 if ($_log_backtrace < 2) {
3471 ++$_log_backtrace; 3681 ++$_log_backtrace;
3472 async { 3682 async {
3683 $Coro::current->{desc} = "abt $msg";
3684
3473 my @bt = fork_call { 3685 my @bt = fork_call {
3474 @addr = map { sprintf "%x", $_ } @addr; 3686 @addr = map { sprintf "%x", $_ } @addr;
3475 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3687 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3476 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3688 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3477 or die "addr2line: $!"; 3689 or die "addr2line: $!";

Diff Legend

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