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.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.392 by root, Fri Oct 26 04:44:54 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
… …
1370 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1371 1425
1372 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1373 1427
1374 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1375} 1439}
1376 1440
1377=item $pl->quit_character 1441=item $pl->quit_character
1378 1442
1379Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1498 or return [];
1435 1499
1436 my @logins; 1500 my @logins;
1437 1501
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1442 1511
1443 utf8::decode $login; 1512 utf8::decode $login;
1444 push @logins, $login; 1513 push @logins, $login;
1445 } 1514 }
1446 1515
… …
1479 1548
1480Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1481 1550
1482=cut 1551=cut
1483 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1484sub expand_cfpod { 1563sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1486 1565
1487 # escape & and < 1566 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1567
1491 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1;
1492 1571
1493 1 while 1572 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1577 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1578 <
1500 $self->gender ? $2 : $1 1579 (?:
1501 }ge 1580 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1581 | < $interior >
1503 || s{H<([^\>]*)>} 1582 )
1583 >
1584 %gcsx
1504 { 1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1605 "")
1508 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1510 1617
1618 for ($xml) {
1511 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1513 1621
1514 # compress some whitespace 1622 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1519 1628
1520 $_ 1629 $xml
1521} 1630}
1522 1631
1523sub hintmode { 1632sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1634 $_[0]{hintmode}
… …
1532=cut 1641=cut
1533 1642
1534sub ext_reply($$@) { 1643sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1644 my ($self, $id, @msg) = @_;
1536 1645
1537 if ($self->ns->extcmd == 2) { 1646 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1647}
1545 1648
1546=item $player->ext_msg ($type, @msg) 1649=item $player->ext_msg ($type, @msg)
1547 1650
1548Sends an ext event to the client. 1651Sends an ext event to the client.
… …
1776 1879
1777sub load_header_from($) { 1880sub load_header_from($) {
1778 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1779 1882
1780 utf8::encode $path; 1883 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1786 1892
1787 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1788 1894
1789 1 1895 1
1790} 1896}
… …
1844sub find { 1950sub find {
1845 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1846 1952
1847 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1848 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1850 1957
1851 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1853 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1854 or return; 1963 or return;
1855 1964
1856 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1857 1966
… …
1859 or return; 1968 or return;
1860 1969
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1864 $map->reset; 1975 $map->reset;
1865 undef $guard;
1866 return find $path; 1976 return find $path;
1867 } 1977 }
1868 1978
1869 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1870 } 1980 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1880 1990
1881 my $path = $self->{path}; 1991 my $path = $self->{path};
1882 1992
1883 { 1993 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1885 1995
1996 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1998
1888 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1889 2000
1890 $self->alloc; 2001 $self->alloc;
1891 2002
1892 $self->pre_load; 2003 $self->pre_load;
1893 Coro::cede; 2004 cf::cede_to_tick;
1894 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1896 or return; 2009 or return;
1897 2010
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1900 2013
1901 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2015 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2018 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1906 } 2022 }
1907 } 2023 }
1908 2024
1909 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1910 # now do the right thing for maps 2028 # now do the right thing for maps
1911 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2031 unless $self->difficulty;
1914 Coro::cede; 2032 cf::cede_to_tick;
1915 2033
1916 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2035 $self->decay_objects;
1918 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1919 $self->update_buttons; 2037 $self->update_buttons;
1920 Coro::cede; 2038 cf::cede_to_tick;
1921 $self->set_darkness_map; 2039 $self->set_darkness_map;
1922 Coro::cede; 2040 cf::cede_to_tick;
1923 $self->activate; 2041 $self->activate;
1924 } 2042 }
2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
1925 2046
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 2048 }
1928 2049
1929 $self->post_load; 2050 $self->post_load;
… …
1940 2061
1941 $self 2062 $self
1942} 2063}
1943 2064
1944# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2066sub load_neighbours {
1946 my ($map) = @_; 2067 my ($map) = @_;
1947 2068
1948 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1949 2070
1950 for (0 .. 3) { 2071 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1952 or next; 2073 or next;
1953 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1954 or next; 2075 or next;
1955 $neigh->load; 2076 $neigh->load;
1956 2077
2078 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2081 }
1960 2082
1961 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1963 or next; 2086 or next;
1964 $neigh->load; 2087 $neigh->load;
1965 } 2088 }
1966} 2089}
1967 2090
… …
1972} 2095}
1973 2096
1974sub do_load_sync { 2097sub do_load_sync {
1975 my ($map) = @_; 2098 my ($map) = @_;
1976 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1977 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1978} 2104}
1979 2105
1980our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1982 2108
1983sub find_async { 2109sub find_async {
1984 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1985 2111
1986 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1987 2113
1988 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2116 }
1991 2117
1992 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1993 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1994 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2125 if (my $map = find $k) {
1997 $map->load; 2126 $map->load if $v;
1998 } 2127 }
1999 2128
2000 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
2001 } 2130 }
2002 } 2131 }
2003 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
2004 }; 2133 };
2005 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
2008} 2137}
2009 2138
2010sub save { 2139sub save {
2011 my ($self) = @_; 2140 my ($self) = @_;
2012 2141
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2143
2015 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
2016 2145
2017 return unless $self->dirty; 2146 return unless $self->dirty;
2018 2147
… …
2024 return if $self->{deny_save}; 2153 return if $self->{deny_save};
2025 2154
2026 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
2027 2156
2028 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2030 }; 2160 };
2031 2161
2032 if ($uniq) { 2162 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2041 my ($self) = @_; 2171 my ($self) = @_;
2042 2172
2043 # save first because save cedes 2173 # save first because save cedes
2044 $self->save; 2174 $self->save;
2045 2175
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2177
2048 return if $self->players; 2178 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2051 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2186 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2187}
2055 2188
2056sub reset_at { 2189sub reset_at {
2057 my ($self) = @_; 2190 my ($self) = @_;
2058 2191
… …
2090 if $uniq; 2223 if $uniq;
2091 } 2224 }
2092 2225
2093 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2094 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2230 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2231
2099 $self->unlink_save; 2232 $self->unlink_save;
2100 $self->destroy; 2233 $self->destroy;
2101} 2234}
2102 2235
2103my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2104 2237
2105sub nuke { 2238sub nuke {
2106 my ($self) = @_; 2239 my ($self) = @_;
2107 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2108 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2109 2245
2110 $self->unlink_save; 2246 $self->unlink_save;
2111 2247
2112 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2253
2118 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2119 2256
2120 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2121} 2258}
2122 2259
2123=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
… …
2199 2336
2200sub inv_recursive { 2337sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2202} 2339}
2203 2340
2341=item $ref = $ob->ref
2342
2343creates and returns a persistent reference to an objetc that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2204package cf; 2369package cf;
2205 2370
2206=back 2371=back
2207 2372
2208=head3 cf::object::player 2373=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2241 } 2406 }
2242 } 2407 }
2243} 2408}
2244 2409
2410=item $object->send_msg ($channel, $msg, $color, [extra...])
2411
2412=cut
2413
2414sub cf::object::send_msg {
2415 my $pl = shift->contr
2416 or return;
2417 $pl->send_msg (@_);
2418}
2419
2245=item $player_object->may ("access") 2420=item $player_object->may ("access")
2246 2421
2247Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2423(e.g. "command_wizcast").
2249 2424
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
2329 2504
2330 $map->load; 2505 $map->load;
2331 $map->load_diag; 2506 $map->load_neighbours;
2332 2507
2333 return unless $self->contr->active; 2508 return unless $self->contr->active;
2334 $self->activate_recursive; 2509 $self->activate_recursive;
2335 2510
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2532
2358 $self->enter_link; 2533 $self->enter_link;
2359 2534
2360 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2538 # *tag paths override both path and x|y
2539 if ($path =~ /^\*(.*)$/) {
2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2541 my $ob = $obs[rand @obs];
2542
2543 # see if we actually can go there
2544 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2545 $ob = $obs[rand @obs];
2546 } else {
2547 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2548 }
2549 # else put us there anyways for now #d#
2550
2551 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2552 } else {
2553 ($path, $x, $y) = (undef, undef, undef);
2554 }
2555 }
2556
2361 my $map = eval { 2557 my $map = eval {
2362 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2363 2559
2364 if ($map) { 2560 if ($map) {
2365 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2367 } else { 2563 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2565 }
2370 2566
2371 $map 2567 $map
2372 }; 2568 };
2373 2569
… …
2463 # if exit is damned, update players death & WoR home-position 2659 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp) 2660 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED); 2661 if $exit->flag (FLAG_DAMNED);
2466 2662
2467 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2468 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2469 unless (eval { 2667 unless (eval {
2470 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2471 2669
2472 1; 2670 1;
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2705the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2509 2707
2510=cut 2708=cut
2511 2709
2710# non-persistent channels (usually the info channel)
2711our %CHANNEL = (
2712 "c/identify" => {
2713 id => "infobox",
2714 title => "Identify",
2715 reply => undef,
2716 tooltip => "Items recently identified",
2717 },
2718 "c/examine" => {
2719 id => "infobox",
2720 title => "Examine",
2721 reply => undef,
2722 tooltip => "Signs and other items you examined",
2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2760);
2761
2512sub cf::client::send_msg { 2762sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2764
2515 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2516 2766
2517 $color &= cf::NDI_CLIENT_MASK; # just in case... 2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2768
2769 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2519 if (ref $channel) { 2778 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2779 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2780 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2781 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2524 } 2784 }
2525 2785
2526 $channel = $channel->{id}; 2786 $channel = $channel->{id};
2527 } 2787 }
2528 2788
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2808 }
2549 2809
2550 $color &= cf::NDI_COLOR_MASK; 2810 $color &= cf::NDI_COLOR_MASK;
2551 2811
2812 utf8::encode $msg;
2813
2552 if (0 && $msg =~ /\[/) { 2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2817 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2819 $self->send_packet ("drawinfo $color $msg")
2557 } 2820 }
2558 } 2821 }
… …
2566=cut 2829=cut
2567 2830
2568sub cf::client::ext_msg($$@) { 2831sub cf::client::ext_msg($$@) {
2569 my ($self, $type, @msg) = @_; 2832 my ($self, $type, @msg) = @_;
2570 2833
2571 my $extcmd = $self->extcmd;
2572
2573 if ($extcmd == 2) { 2834 if ($self->extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2836 } elsif ($self->extcmd == 1) { # TODO: remove
2576 push @msg, msgtype => "event_$type"; 2837 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 }
2840}
2841
2842=item $client->ext_reply ($msgid, @msg)
2843
2844Sends an ext reply to the client.
2845
2846=cut
2847
2848sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_;
2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2857 }
2579} 2858}
2580 2859
2581=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
… …
2643 my ($type, $reply, @payload) = 2922 my ($type, $reply, @payload) =
2644 "ARRAY" eq ref $msg 2923 "ARRAY" eq ref $msg
2645 ? @$msg 2924 ? @$msg
2646 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2647 2926
2927 my @reply;
2928
2648 if (my $cb = $EXTICMD{$type}) { 2929 if (my $cb = $EXTICMD{$type}) {
2649 my @reply = $cb->($ns, @payload); 2930 @reply = $cb->($ns, @payload);
2650
2651 $ns->ext_reply ($reply, @reply)
2652 if $reply;
2653 } 2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2654 } else { 2936 } else {
2655 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2656 } 2938 }
2657 2939
2658 cf::override; 2940 cf::override;
… …
2705our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2707 2989
2708$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2709 2991
2710$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2992$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math
2994 grepstart grepwhile mapstart mapwhile
2995 sort time
2996));
2711 2997
2712# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2713 2999
2714=pod 3000=pod
2715 3001
2716The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2717 3003
2718 cf::object 3004 cf::object
2719 contr pay_amount pay_player map x y force_find force_add 3005 contr pay_amount pay_player map x y force_find force_add destroy
2720 insert remove 3006 insert remove name archname title slaying race decrease_ob_nr
2721 3007
2722 cf::object::player 3008 cf::object::player
2723 player 3009 player
2724 3010
2725 cf::player 3011 cf::player
… …
2730 3016
2731=cut 3017=cut
2732 3018
2733for ( 3019for (
2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race
2735 insert remove)], 3022 decrease_ob_nr destroy)],
2736 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2739) { 3026) {
2740 no strict 'refs'; 3027 no strict 'refs';
… …
2816# the server's init and main functions 3103# the server's init and main functions
2817 3104
2818sub load_facedata($) { 3105sub load_facedata($) {
2819 my ($path) = @_; 3106 my ($path) = @_;
2820 3107
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113
2821 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2822 3115
2823 my $facedata; 3116 my $facedata;
2824 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 3118 or die "$path: $!";
2826 3119
2827 $facedata = Coro::Storable::thaw $facedata; 3120 $facedata = Coro::Storable::thaw $facedata;
2828 3121
2829 $facedata->{version} == 2 3122 $facedata->{version} == 2
2830 or cf::cleanup "$path: version mismatch, cannot proceed."; 3123 or cf::cleanup "$path: version mismatch, cannot proceed.";
3124
3125 # patch in the exptable
3126 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3129 };
3130 cf::cede_to_tick;
2831 3131
2832 { 3132 {
2833 my $faces = $facedata->{faceinfo}; 3133 my $faces = $facedata->{faceinfo};
2834 3134
2835 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2837 cf::face::set_visibility $idx, $info->{visibility}; 3137 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 3138 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 3141
2842 cf::cede_to_tick; 3142 cf::cede_to_tick;
2843 } 3143 }
2844 3144
2845 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
… …
2870 3170
2871 { 3171 {
2872 # TODO: for gcfclient pleasure, we should give resources 3172 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 3173 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 3174 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876 3175
2877 my $soundconf = delete $res->{"res/sound.conf"}; 3176 my $soundconf = delete $res->{"res/sound.conf"};
2878 3177
2879 while (my ($name, $info) = each %$res) { 3178 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3179 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
2886 3181
2887 if ($info->{type} & 1) { 3182 if ($info->{type} & 1) {
2888 # prepend meta info 3183 # prepend meta info
2889 3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 3190 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else { 3191 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3192 $data = $info->{data};
2896 } 3193 }
2897 3194
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 3196 cf::face::set_type $idx, $info->{type};
2899 3197
2900 cf::cede_to_tick; 3198 cf::cede_to_tick;
2901 } 3199 }
2902 3200
… …
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_] 3205 my $sound = $soundconf->{compat}[$_]
2908 or next; 3206 or next;
2909 3207
2910 my $face = cf::face::find "sound/$sound->[1]"; 3208 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face; 3209 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat 3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 } 3211 }
2915 3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
2916 #TODO 3216 }
2917 } 3217 }
2918 } 3218 }
2919 3219
2920 1 3220 1
2921} 3221}
… …
2927 $ns->fx_want ($k, $v); 3227 $ns->fx_want ($k, $v);
2928 } 3228 }
2929}; 3229};
2930 3230
2931sub reload_regions { 3231sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = ();
3235
2932 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2933 or die "unable to load regions file\n"; 3237 or die "unable to load regions file\n";
2934 3238
2935 for (cf::region::list) { 3239 for (cf::region::list) {
2936 $_->{match} = qr/$_->{match}/ 3240 $_->{match} = qr/$_->{match}/
… …
2972 3276
2973sub init { 3277sub init {
2974 reload_resources; 3278 reload_resources;
2975} 3279}
2976 3280
2977sub cfg_load { 3281sub reload_config {
2978 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2979 or return; 3283 or return;
2980 3284
2981 local $/; 3285 local $/;
2982 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
… …
2998sub main { 3302sub main {
2999 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
3000 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
3001 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3002 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
3003 Event::one_event; 3308 Event::one_event;
3004 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
3005 }; 3310 };
3006 3311
3007 cfg_load; 3312 reload_config;
3008 db_init; 3313 db_init;
3009 load_extensions; 3314 load_extensions;
3010 3315
3011 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
3012 Event::loop; 3317 Event::loop;
… …
3079 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
3080 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
3081 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
3082 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
3083 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3084 $pl->save; 3390 $pl->save;
3085 } 3391 }
3086 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
3087 3393
3088 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
… …
3136 3442
3137 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
3138 for (;;) { 3444 for (;;) {
3139 BDB::flush; 3445 BDB::flush;
3140 IO::AIO::flush; 3446 IO::AIO::flush;
3141 Coro::cede; 3447 Coro::cede_notself;
3142 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
3143 warn "iterate..."; 3449 warn "iterate...";
3144 } 3450 }
3145 3451
3146 ++$RELOAD; 3452 ++$RELOAD;
… …
3205 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
3206 require cf; 3512 require cf;
3207 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3208 3514
3209 warn "loading config and database again"; 3515 warn "loading config and database again";
3210 cf::cfg_load; 3516 cf::reload_config;
3211 3517
3212 warn "loading extensions"; 3518 warn "loading extensions";
3213 cf::load_extensions; 3519 cf::load_extensions;
3214 3520
3215 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
… …
3251register_command "reload" => sub { 3557register_command "reload" => sub {
3252 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3253 3559
3254 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3255 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3256 async { reload_perl }; 3564 reload_perl;
3565 };
3257 } 3566 }
3258}; 3567};
3259 3568
3260unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3261 3570
… …
3280 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
3281 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3282 $signal->wait; 3591 $signal->wait;
3283} 3592}
3284 3593
3285 my $min = 1e6;#d#
3286 my $avg = 10;
3287$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
3288 reentrant => 0, 3595 reentrant => 0,
3289 parked => 1, 3596 parked => 1,
3290 prio => 0, 3597 prio => 0,
3291 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
… …
3299 3606
3300 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
3301 3608
3302 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3303 3610
3304 0 && sync_job {#d#
3305 for(1..10) {
3306 my $t = Event::time;
3307 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3308 or die;
3309
3310 $map->width (50);
3311 $map->height (50);
3312 $map->alloc;
3313 $map->_load_objects ("/tmp/x.map", 1);
3314 my $t = Event::time - $t;
3315
3316 #next unless $t < 0.0013;#d#
3317 if ($t < $min) {
3318 $min = $t;
3319 }
3320 $avg = $avg * 0.99 + $t * 0.01;
3321 }
3322 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3323 exit 0;
3324 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3325 };
3326
3327 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
3328 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3329 3613
3330 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3331 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3332 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3333 write_runtime 3618 write_runtime
3334 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3335 }; 3620 };
3336 } 3621 }
3337 3622
3338# my $AFTER = Event::time;
3339# warn $AFTER - $NOW;#d#
3340
3341 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3342 $sig->send; 3624 $sig->send;
3343 } 3625 }
3344 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
3345 $sig->send; 3627 $sig->send;
… …
3355 3637
3356 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
3357 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3358 3640
3359 _post_tick; 3641 _post_tick;
3360
3361
3362 }, 3642 },
3363); 3643);
3364 3644
3365{ 3645{
3646 BDB::min_parallel 8;
3366 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3367 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3368 reentrant => 0, 3649 reentrant => 0,
3369 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3370 poll => 'r', 3651 poll => 'r',
3371 prio => 0, 3652 prio => 0,
3372 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3373 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3374 ); 3655 );
3375 BDB::min_parallel 8;
3376 3656
3377 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3378 my $status; 3658 my $status;
3379 my $current = $Coro::current; 3659 my $current = $Coro::current;
3380 ( 3660 (
… …
3389 ) 3669 )
3390 }; 3670 };
3391 3671
3392 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3393 $DB_ENV = BDB::db_env_create; 3673 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1);
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3394 3678
3395 cf::sync_job { 3679 cf::sync_job {
3396 eval { 3680 eval {
3397 BDB::db_env_open 3681 BDB::db_env_open
3398 $DB_ENV, 3682 $DB_ENV,
… …
3400 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3684 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3401 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3402 0666; 3686 0666;
3403 3687
3404 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3405
3406 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3407 $DB_ENV->set_lk_detect;
3408 }; 3689 };
3409 3690
3410 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3411 }; 3692 };
3412 } 3693 }
3694
3695 $BDB_DEADLOCK_WATCHER = Event->timer (
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 );
3705 $BDB_CHECKPOINT_WATCHER = Event->timer (
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 );
3715 $BDB_TRICKLE_WATCHER = Event->timer (
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 );
3413} 3725}
3414 3726
3415{ 3727{
3416 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3417 3729
… …
3420 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3421 reentrant => 0, 3733 reentrant => 0,
3422 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3423 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3424 poll => 'r', 3736 poll => 'r',
3425 prio => 6, 3737 prio => 0,
3426 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3427 ); 3739 );
3428} 3740}
3429 3741
3430my $_log_backtrace; 3742my $_log_backtrace;
… …
3436 3748
3437 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3438 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3439 ++$_log_backtrace; 3751 ++$_log_backtrace;
3440 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3441 my @bt = fork_call { 3755 my @bt = fork_call {
3442 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3443 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3444 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3445 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

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