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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

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

Diff Legend

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