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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 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
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
327=item cf::async { BLOCK } 399=item cf::async { BLOCK }
328 400
329Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
355 my $time = Event::time; 427 my $time = Event::time;
356 428
357 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
359 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
360 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 435 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
363 437
364 my $busy = 1; 438 my $busy = 1;
365 my @res; 439 my @res;
366 440
367 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 443 @res = eval { $job->() };
369 warn $@ if $@; 444 warn $@ if $@;
370 undef $busy; 445 undef $busy;
371 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
372 447
373 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
374 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
375 } 454 }
376 455
377 $time = Event::time - $time; 456 $time = Event::time - $time;
378 457
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
416Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
418 497
419=cut 498=cut
420 499
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 500sub fork_call(&@) {
431 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
432 502
433# 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,
434# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 506
438 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 508 reset_signals;
452 local $SIG{__WARN__}; 509 &$cb
453 local $SIG{__DIE__}; 510 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 511
460 eval { 512 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 513}
473 514
474=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
475 516
476Returns a single value from the environment database. 517Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
479 520
480Stores 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
481data 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).
482 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
483=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}
484 547
485our $DB; 548our $DB;
486 549
487sub db_init { 550sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 551 cf::sync_job {
492 eval { 552 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 553 };
502} 554}
503 555
504sub db_get($$) { 556sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
506 558
556 if (1) { 608 if (1) {
557 $md5 = 609 $md5 =
558 join "\x00", 610 join "\x00",
559 $processversion, 611 $processversion,
560 map { 612 map {
561 Coro::cede; 613 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 615 } 0.. $#$src;
564 616
565 617
566 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
919=cut 971=cut
920 972
921############################################################################# 973#############################################################################
922# object support 974# object support
923 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#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
1017
924sub reattach { 1018sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1020 my ($obj) = @_;
927 1021
928 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
974sub object_freezer_save { 1068sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
976 1070
977 sync_job { 1071 sync_job {
978 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
981 1076
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1081 close $fh;
987 1082
988 if (@$objs) { 1083 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1089 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
996 } 1091 }
1004 } 1099 }
1005 } else { 1100 } else {
1006 aio_unlink $filename; 1101 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1008 } 1103 }
1009 } 1104 };
1010} 1105}
1011 1106
1012sub object_freezer_as_string { 1107sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1014 1109
1026 or return; 1121 or return;
1027 1122
1028 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1125 or return;
1126
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1032 } 1129 }
1033 1130
1131 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1036 return ($data, $av); 1135 ($data, $av)
1037} 1136}
1038 1137
1039=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1040 1139
1041=over 4 1140=over 4
1114 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1115 1214
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1216
1118 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1124 } else { 1232 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1234 }
1127 1235
1128 cf::override; 1236 cf::override;
1218 1326
1219=head3 cf::player 1327=head3 cf::player
1220 1328
1221=over 4 1329=over 4
1222 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
1223=item cf::player::find $login 1345=item cf::player::find $login
1224 1346
1225Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1226 1348
1227=cut 1349=cut
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1388
1267 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1270 } 1397 }
1271 } 1398 }
1272} 1399}
1273 1400
1283 1410
1284 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1286 1413
1287 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1288 Coro::cede; 1415 cf::cede_to_tick;
1289} 1416}
1290 1417
1291sub new($) { 1418sub new($) {
1292 my ($login) = @_; 1419 my ($login) = @_;
1293 1420
1297 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1298 1425
1299 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1300 1427
1301 $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 (@_);
1302} 1439}
1303 1440
1304=item $pl->quit_character 1441=item $pl->quit_character
1305 1442
1306Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1361 or return []; 1498 or return [];
1362 1499
1363 my @logins; 1500 my @logins;
1364 1501
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1369 1511
1370 utf8::decode $login; 1512 utf8::decode $login;
1371 push @logins, $login; 1513 push @logins, $login;
1372 } 1514 }
1373 1515
1406 1548
1407Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1408 1550
1409=cut 1551=cut
1410 1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1411sub expand_cfpod { 1563sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1564 my ($self, $pod) = @_;
1413 1565
1414 # escape & and < 1566 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1567
1418 # this is buggy, it needs to properly take care of nested <'s 1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1419 1571
1420 1 while 1572 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1573 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1574
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1575 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1576 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1577 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1578 <
1427 $self->gender ? $2 : $1 1579 (?:
1428 }ge 1580 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1581 | < $interior >
1430 || s{H<([^\>]*)>} 1582 )
1583 >
1584 %gcsx
1431 { 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") {
1432 ("<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>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1605 "")
1435 [$self->{hintmode}] 1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1437 1617
1618 for ($xml) {
1438 # create single paragraphs (very hackish) 1619 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1620 s/(?<=\S)\n(?=\w)/ /g;
1440 1621
1441 # compress some whitespace 1622 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1623 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1624 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1625 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1626 s/\n+$//; # ending lines
1627 }
1446 1628
1447 $_ 1629 $xml
1448} 1630}
1449 1631
1450sub hintmode { 1632sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1634 $_[0]{hintmode}
1453} 1635}
1454 1636
1455=item $player->ext_reply ($msgid, %msg) 1637=item $player->ext_reply ($msgid, @msg)
1456 1638
1457Sends an ext reply to the player. 1639Sends an ext reply to the player.
1458 1640
1459=cut 1641=cut
1460 1642
1461sub ext_reply($$%) { 1643sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1644 my ($self, $id, @msg) = @_;
1463 1645
1464 $msg{msgid} = $id; 1646 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1647}
1467 1648
1468=item $player->ext_event ($type, %msg) 1649=item $player->ext_msg ($type, @msg)
1469 1650
1470Sends an ext event to the client. 1651Sends an ext event to the client.
1471 1652
1472=cut 1653=cut
1473 1654
1474sub ext_event($$%) { 1655sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1656 my ($self, $type, @msg) = @_;
1476 1657
1477 $self->ns->ext_event ($type, %msg); 1658 $self->ns->ext_msg ($type, @msg);
1478} 1659}
1479 1660
1480=head3 cf::region 1661=head3 cf::region
1481 1662
1482=over 4 1663=over 4
1698 1879
1699sub load_header_from($) { 1880sub load_header_from($) {
1700 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1701 1882
1702 utf8::encode $path; 1883 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1892
1709 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1710 1894
1711 1 1895 1
1712} 1896}
1766sub find { 1950sub find {
1767 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1768 1952
1769 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1770 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1772 1957
1773 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1774 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
1775 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1776 or return; 1963 or return;
1777 1964
1778 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1779 1966
1781 or return; 1968 or return;
1782 1969
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1786 $map->reset; 1975 $map->reset;
1787 undef $guard;
1788 return find $path; 1976 return find $path;
1789 } 1977 }
1790 1978
1791 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1792 } 1980 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1802 1990
1803 my $path = $self->{path}; 1991 my $path = $self->{path};
1804 1992
1805 { 1993 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1807 1995
1996 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 1998
1810 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1811 2000
1812 $self->alloc; 2001 $self->alloc;
1813 2002
1814 $self->pre_load; 2003 $self->pre_load;
1815 Coro::cede; 2004 cf::cede_to_tick;
1816 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1818 or return; 2009 or return;
1819 2010
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1822 2013
1823 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2015 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2018 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1828 } 2022 }
1829 } 2023 }
1830 2024
1831 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1832 # now do the right thing for maps 2028 # now do the right thing for maps
1833 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2031 unless $self->difficulty;
1836 Coro::cede; 2032 cf::cede_to_tick;
1837 2033
1838 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2035 $self->decay_objects;
1840 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1841 $self->update_buttons; 2037 $self->update_buttons;
1842 Coro::cede; 2038 cf::cede_to_tick;
1843 $self->set_darkness_map; 2039 $self->set_darkness_map;
1844 Coro::cede; 2040 cf::cede_to_tick;
1845 $self->activate; 2041 $self->activate;
1846 } 2042 }
2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
1847 2046
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 2048 }
1850 2049
1851 $self->post_load; 2050 $self->post_load;
1862 2061
1863 $self 2062 $self
1864} 2063}
1865 2064
1866# 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
1867sub load_diag { 2066sub load_neighbours {
1868 my ($map) = @_; 2067 my ($map) = @_;
1869 2068
1870 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1871 2070
1872 for (0 .. 3) { 2071 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1874 or next; 2073 or next;
1875 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1876 or next; 2075 or next;
1877 $neigh->load; 2076 $neigh->load;
1878 2077
2078 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2081 }
1882 2082
1883 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1885 or next; 2086 or next;
1886 $neigh->load; 2087 $neigh->load;
1887 } 2088 }
1888} 2089}
1889 2090
1894} 2095}
1895 2096
1896sub do_load_sync { 2097sub do_load_sync {
1897 my ($map) = @_; 2098 my ($map) = @_;
1898 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1899 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1900} 2104}
1901 2105
1902our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1904 2108
1905sub find_async { 2109sub find_async {
1906 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1907 2111
1908 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1909 2113
1910 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2116 }
1913 2117
1914 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1915 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1916 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2125 if (my $map = find $k) {
1919 $map->load; 2126 $map->load if $v;
1920 } 2127 }
1921 2128
1922 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1923 } 2130 }
1924 } 2131 }
1925 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1926 }; 2133 };
1927 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1930} 2137}
1931 2138
1932sub save { 2139sub save {
1933 my ($self) = @_; 2140 my ($self) = @_;
1934 2141
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2143
1937 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1938 2145
1939 return unless $self->dirty; 2146 return unless $self->dirty;
1940 2147
1946 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1947 2154
1948 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1949 2156
1950 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1952 }; 2160 };
1953 2161
1954 if ($uniq) { 2162 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1963 my ($self) = @_; 2171 my ($self) = @_;
1964 2172
1965 # save first because save cedes 2173 # save first because save cedes
1966 $self->save; 2174 $self->save;
1967 2175
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2177
1970 return if $self->players; 2178 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1973 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2186 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2187}
1977 2188
1978sub reset_at { 2189sub reset_at {
1979 my ($self) = @_; 2190 my ($self) = @_;
1980 2191
2012 if $uniq; 2223 if $uniq;
2013 } 2224 }
2014 2225
2015 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2016 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2230 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2231
2021 $self->unlink_save; 2232 $self->unlink_save;
2022 $self->destroy; 2233 $self->destroy;
2023} 2234}
2024 2235
2025my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
2026 2237
2027sub nuke { 2238sub nuke {
2028 my ($self) = @_; 2239 my ($self) = @_;
2029 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2030 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
2031 2245
2032 $self->unlink_save; 2246 $self->unlink_save;
2033 2247
2034 bless $self, "cf::map"; 2248 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2253
2040 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
2041 2256
2042 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2043} 2258}
2044 2259
2045=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
2121 2336
2122sub inv_recursive { 2337sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2124} 2339}
2125 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
2126package cf; 2369package cf;
2127 2370
2128=back 2371=back
2129 2372
2130=head3 cf::object::player 2373=head3 cf::object::player
2152 2395
2153 } else { 2396 } else {
2154 my $pl = $self->contr; 2397 my $pl = $self->contr;
2155 2398
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2399 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2400 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2402
2165 } else { 2403 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2404 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2168 } 2406 }
2169 } 2407 }
2408}
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 (@_);
2170} 2418}
2171 2419
2172=item $player_object->may ("access") 2420=item $player_object->may ("access")
2173 2421
2174Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
2256 2504
2257 $map->load; 2505 $map->load;
2258 $map->load_diag; 2506 $map->load_neighbours;
2259 2507
2260 return unless $self->contr->active; 2508 return unless $self->contr->active;
2261 $self->activate_recursive; 2509 $self->activate_recursive;
2262 2510
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2532
2285 $self->enter_link; 2533 $self->enter_link;
2286 2534
2287 (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
2288 my $map = eval { 2557 my $map = eval {
2289 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2290 2559
2291 if ($map) { 2560 if ($map) {
2292 $map = $map->customise_for ($self); 2561 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2562 $map = $check->($map) if $check && $map;
2294 } else { 2563 } else {
2295 $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);
2296 } 2565 }
2297 2566
2298 $map 2567 $map
2299 }; 2568 };
2300 2569
2390 # if exit is damned, update players death & WoR home-position 2659 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2660 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2661 if $exit->flag (FLAG_DAMNED);
2393 2662
2394 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
2395 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2667 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
2398 2669
2399 1; 2670 1;
2434the 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
2435the message unless the client supports the msg packet. 2706the message unless the client supports the msg packet.
2436 2707
2437=cut 2708=cut
2438 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
2439sub cf::client::send_msg { 2762sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2763 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2764
2442 $msg = $self->pl->expand_cfpod ($msg); 2765 $msg = $self->pl->expand_cfpod ($msg);
2443 2766
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 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
2448 if (ref $channel) { 2778 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2779 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2780 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2781 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2453 } 2784 }
2454 2785
2455 $channel = $channel->{id}; 2786 $channel = $channel->{id};
2456 } 2787 }
2457 2788
2789 return unless @extra || length $msg;
2790
2458 if ($self->can_msg) { 2791 if ($self->can_msg) {
2792 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF;
2795
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2796 $self->send_packet ("msg " . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2798 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809
2810 $color &= cf::NDI_COLOR_MASK;
2811
2812 utf8::encode $msg;
2813
2472 if (0 && $msg =~ /\[/) { 2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2817 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2819 $self->send_packet ("drawinfo $color $msg")
2477 } 2820 }
2478 } 2821 }
2479 } 2822 }
2480} 2823}
2481 2824
2482=item $client->ext_event ($type, %msg) 2825=item $client->ext_msg ($type, @msg)
2483 2826
2484Sends an ext event to the client. 2827Sends an ext event to the client.
2485 2828
2486=cut 2829=cut
2487 2830
2488sub cf::client::ext_event($$%) { 2831sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2832 my ($self, $type, @msg) = @_;
2490 2833
2491 return unless $self->extcmd; 2834 if ($self->extcmd == 2) {
2492 2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2837 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 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;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2495} 2858}
2496 2859
2497=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
2498 2861
2499Queues a query to the client, calling the given callback with 2862Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 2917 my ($ns, $buf) = @_;
2555 2918
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2919 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2920
2558 if (ref $msg) { 2921 if (ref $msg) {
2922 my ($type, $reply, @payload) =
2923 "ARRAY" eq ref $msg
2924 ? @$msg
2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2926
2927 my @reply;
2928
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2929 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2930 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2565 } else { 2936 } else {
2566 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";
2567 } 2938 }
2568 2939
2569 cf::override; 2940 cf::override;
2616our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2618 2989
2619$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2620 2991
2621$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));
2622 2997
2623# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2624 2999
2625=pod 3000=pod
2626 3001
2627The following functions and methods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2628 3003
2629 cf::object 3004 cf::object
2630 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
2631 insert remove 3006 insert remove name archname title slaying race decrease_ob_nr
2632 3007
2633 cf::object::player 3008 cf::object::player
2634 player 3009 player
2635 3010
2636 cf::player 3011 cf::player
2641 3016
2642=cut 3017=cut
2643 3018
2644for ( 3019for (
2645 ["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
2646 insert remove)], 3022 decrease_ob_nr destroy)],
2647 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2650) { 3026) {
2651 no strict 'refs'; 3027 no strict 'refs';
2727# the server's init and main functions 3103# the server's init and main functions
2728 3104
2729sub load_facedata($) { 3105sub load_facedata($) {
2730 my ($path) = @_; 3106 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 3114 warn "loading facedata from $path\n";
2733 3115
2734 my $facedata; 3116 my $facedata;
2735 0 < aio_load $path, $facedata 3117 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3118 or die "$path: $!";
2737 3119
2738 $facedata = Coro::Storable::thaw $facedata; 3120 $facedata = Coro::Storable::thaw $facedata;
2739 3121
2740 $facedata->{version} == 2 3122 $facedata->{version} == 2
2741 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;
2742 3131
2743 { 3132 {
2744 my $faces = $facedata->{faceinfo}; 3133 my $faces = $facedata->{faceinfo};
2745 3134
2746 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 3137 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3138 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3141
2753 cf::cede_to_tick; 3142 cf::cede_to_tick;
2754 } 3143 }
2755 3144
2756 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
2781 3170
2782 { 3171 {
2783 # TODO: for gcfclient pleasure, we should give resources 3172 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3173 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3174 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 3175
3176 my $soundconf = delete $res->{"res/sound.conf"};
2787 3177
2788 while (my ($name, $info) = each %$res) { 3178 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3179 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
2796 3181
2797 if ($name =~ /\.jpg$/) { 3182 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3183 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
2800 } else { 3191 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3192 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3193 }
2807 3194
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
2808 cf::cede_to_tick; 3198 cf::cede_to_tick;
2809 } 3199 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
2810 } 3218 }
2811 3219
2812 1 3220 1
2813} 3221}
2814 3222
3223register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_;
3225
3226 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v);
3228 }
3229};
3230
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 3236 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3237 or die "unable to load regions file\n";
2818 3238
2819 for (cf::region::list) { 3239 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3240 $_->{match} = qr/$_->{match}/
2856 3276
2857sub init { 3277sub init {
2858 reload_resources; 3278 reload_resources;
2859} 3279}
2860 3280
2861sub cfg_load { 3281sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3283 or return;
2864 3284
2865 local $/; 3285 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
2882sub main { 3302sub main {
2883 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
2885 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#
2886 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
2887 Event::one_event; 3308 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
2889 }; 3310 };
2890 3311
2891 cfg_load; 3312 reload_config;
2892 db_init; 3313 db_init;
2893 load_extensions; 3314 load_extensions;
2894 3315
2895 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
2896 Event::loop; 3317 Event::loop;
2963 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3390 $pl->save;
2969 } 3391 }
2970 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
2971 3393
2972 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
3020 3442
3021 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
3022 for (;;) { 3444 for (;;) {
3023 BDB::flush; 3445 BDB::flush;
3024 IO::AIO::flush; 3446 IO::AIO::flush;
3025 Coro::cede; 3447 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3449 warn "iterate...";
3028 } 3450 }
3029 3451
3030 ++$RELOAD; 3452 ++$RELOAD;
3089 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
3090 require cf; 3512 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3514
3093 warn "loading config and database again"; 3515 warn "loading config and database again";
3094 cf::cfg_load; 3516 cf::reload_config;
3095 3517
3096 warn "loading extensions"; 3518 warn "loading extensions";
3097 cf::load_extensions; 3519 cf::load_extensions;
3098 3520
3099 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
3135register_command "reload" => sub { 3557register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
3137 3559
3138 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
3562 async {
3563 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3564 reload_perl;
3565 };
3141 } 3566 }
3142}; 3567};
3143 3568
3144unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
3145 3570
3164 my $signal = new Coro::Signal; 3589 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3591 $signal->wait;
3167} 3592}
3168 3593
3169 my $min = 1e6;#d#
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
3172 reentrant => 0, 3595 reentrant => 0,
3173 parked => 1, 3596 parked => 1,
3174 prio => 0, 3597 prio => 0,
3175 at => $NEXT_TICK || $TICK, 3598 at => $NEXT_TICK || $TICK,
3183 3606
3184 $NOW = $tick_start = Event::time; 3607 $NOW = $tick_start = Event::time;
3185 3608
3186 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3187 3610
3188 0 && sync_job {#d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 };
3210
3211 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
3213 3613
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
3217 write_runtime 3618 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
3219 }; 3620 };
3220 } 3621 }
3221 3622
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3624 $sig->send;
3227 } 3625 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3626 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3627 $sig->send;
3239 3637
3240 $LOAD = ($NOW - $tick_start) / $TICK; 3638 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3640
3243 _post_tick; 3641 _post_tick;
3244
3245
3246 }, 3642 },
3247); 3643);
3248 3644
3249{ 3645{
3646 BDB::min_parallel 8;
3250 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
3251 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
3252 reentrant => 0, 3649 reentrant => 0,
3253 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
3254 poll => 'r', 3651 poll => 'r',
3255 prio => 0, 3652 prio => 0,
3256 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
3258 ); 3655 );
3259 BDB::min_parallel 8;
3260 3656
3261 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
3262 my $status; 3658 my $status;
3263 my $current = $Coro::current; 3659 my $current = $Coro::current;
3264 ( 3660 (
3273 ) 3669 )
3274 }; 3670 };
3275 3671
3276 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
3277 $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);
3278 3678
3279 cf::sync_job { 3679 cf::sync_job {
3280 eval { 3680 eval {
3281 BDB::db_env_open 3681 BDB::db_env_open
3282 $DB_ENV, 3682 $DB_ENV,
3284 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
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3686 0666;
3287 3687
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3689 };
3293 3690
3294 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3692 };
3296 } 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 );
3297} 3725}
3298 3726
3299{ 3727{
3300 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
3301 3729
3304 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
3305 reentrant => 0, 3733 reentrant => 0,
3306 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
3308 poll => 'r', 3736 poll => 'r',
3309 prio => 6, 3737 prio => 0,
3310 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
3311 ); 3739 );
3312} 3740}
3313 3741
3314my $_log_backtrace; 3742my $_log_backtrace;
3320 3748
3321 # limit the # of concurrent backtraces 3749 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3750 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3751 ++$_log_backtrace;
3324 async { 3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3325 my @bt = fork_call { 3755 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3756 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 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 |"
3329 or die "addr2line: $!"; 3759 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines