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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
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.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
78our $NEXT_TICK; 80our $NEXT_TICK;
79our $NOW; 81our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
81 83
82our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 88our $DB_ENV;
84 89
85our %CFG; 90our %CFG;
86 91
87our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 93our $RUNTIME;
89 94
90our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
93 98
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 101
166 171
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
171=back 182=back
172 183
173=cut 184=cut
174 185
175BEGIN { 186BEGIN {
179 $msg .= "\n" 190 $msg .= "\n"
180 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
181 192
182 $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;
183 194
184 utf8::encode $msg;
185 LOG llevError, $msg; 195 LOG llevError, $msg;
186 }; 196 };
187} 197}
188 198
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
267returned. 277returned.
268 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
269Lock 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
270uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
271 284
272=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
273 286
274Return 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.
275 288
276=cut 289=cut
277 290
278our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
279 293
280sub lock_wait($) { 294sub lock_wait($) {
281 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#
282 301
283 # wait for lock, if any 302 # wait for lock, if any
284 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 305 Coro::schedule;
292 311
293 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
294 lock_wait $key; 313 lock_wait $key;
295 314
296 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
297 317
298 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
301 } 322 }
302} 323}
303 324
313 my $guard = Coro::guard { 334 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 335 $TICK_WATCHER->start;
315 }; 336 };
316 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
317 $guard 338 $guard
339}
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;
318} 397}
319 398
320=item cf::async { BLOCK } 399=item cf::async { BLOCK }
321 400
322Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
356 435
357 my $busy = 1; 436 my $busy = 1;
358 my @res; 437 my @res;
359 438
360 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 441 @res = eval { $job->() };
362 warn $@ if $@; 442 warn $@ if $@;
363 undef $busy; 443 undef $busy;
364 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
365 445
412=cut 492=cut
413 493
414sub fork_call(&@) { 494sub fork_call(&@) {
415 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
416 496
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 497 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 498 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 499 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 500
422 if (my $pid = fork) { 501 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 502 reset_signals;
435 local $SIG{__WARN__}; 503 &$cb
436 local $SIG{__DIE__}; 504 }, @args;
437 eval {
438 close $fh1;
439 505
440 my @res = eval { $cb->(@args) }; 506 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 507}
448 508
449=item $value = cf::db_get $family => $key 509=item $value = cf::db_get $family => $key
450 510
451Returns a single value from the environment database. 511Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
454 514
455Stores the given C<$value> in the family. It can currently store binary 515Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
458=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
459 541
460our $DB; 542our $DB;
461 543
462sub db_init { 544sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 545 cf::sync_job {
467 eval { 546 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 547 };
477} 548}
478 549
479sub db_get($$) { 550sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
481 552
531 if (1) { 602 if (1) {
532 $md5 = 603 $md5 =
533 join "\x00", 604 join "\x00",
534 $processversion, 605 $processversion,
535 map { 606 map {
536 Coro::cede; 607 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 609 } 0.. $#$src;
539 610
540 611
541 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
847 "; 918 ";
848 die if $@; 919 die if $@;
849} 920}
850 921
851our $override; 922our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 923our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 924
854sub override { 925sub override {
855 $override = 1; 926 $override = 1;
856 @invoke_results = (); 927 @INVOKE_RESULTS = (@_);
857} 928}
858 929
859sub do_invoke { 930sub do_invoke {
860 my $event = shift; 931 my $event = shift;
861 my $callbacks = shift; 932 my $callbacks = shift;
862 933
863 @invoke_results = (); 934 @INVOKE_RESULTS = ();
864 935
865 local $override; 936 local $override;
866 937
867 for (@$callbacks) { 938 for (@$callbacks) {
868 eval { &{$_->[1]} }; 939 eval { &{$_->[1]} };
885 956
886Generate an object-specific event with the given arguments. 957Generate an object-specific event with the given arguments.
887 958
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 959This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 960removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 961results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 962
892=back 963=back
893 964
894=cut 965=cut
895 966
896############################################################################# 967#############################################################################
897# object support 968# object support
969#
970
971sub _can_merge {
972 my ($ob1, $ob2) = @_;
973
974 local $Storable::canonical = 1;
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977
978 $fob1 eq $fob2
979}
898 980
899sub reattach { 981sub reattach {
900 # basically do the same as instantiate, without calling instantiate 982 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 983 my ($obj) = @_;
902 984
949sub object_freezer_save { 1031sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
951 1033
952 sync_job { 1034 sync_job {
953 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
956 1039
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
979 } 1062 }
980 } else { 1063 } else {
981 aio_unlink $filename; 1064 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
983 } 1066 }
984 } 1067 };
985} 1068}
986 1069
987sub object_freezer_as_string { 1070sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
989 1072
1001 or return; 1084 or return;
1002 1085
1003 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1088 or return;
1089
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1007 } 1091 }
1008 1092
1093 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1011 return ($data, $av); 1097 ($data, $av)
1012} 1098}
1013 1099
1014=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1015 1101
1016=over 4 1102=over 4
1089 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
1090 1176
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1178
1093 if (ref $msg) { 1179 if (ref $msg) {
1180 my ($type, $reply, @payload) =
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184
1185 my @reply;
1186
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1099 } else { 1194 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1196 }
1102 1197
1103 cf::override; 1198 cf::override;
1193 1288
1194=head3 cf::player 1289=head3 cf::player
1195 1290
1196=over 4 1291=over 4
1197 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1198=item cf::player::find $login 1307=item cf::player::find $login
1199 1308
1200Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1201 1310
1202=cut 1311=cut
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1350
1242 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1245 } 1359 }
1246 } 1360 }
1247} 1361}
1248 1362
1258 1372
1259 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1261 1375
1262 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1263 Coro::cede; 1377 cf::cede_to_tick;
1264} 1378}
1265 1379
1266sub new($) { 1380sub new($) {
1267 my ($login) = @_; 1381 my ($login) = @_;
1268 1382
1272 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1273 1387
1274 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1275 1389
1276 $self 1390 $self
1391}
1392
1393=item $player->send_msg ($channel, $msg, $color, [extra...])
1394
1395=cut
1396
1397sub send_msg {
1398 my $ns = shift->ns
1399 or return;
1400 $ns->send_msg (@_);
1277} 1401}
1278 1402
1279=item $pl->quit_character 1403=item $pl->quit_character
1280 1404
1281Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1460 or return [];
1337 1461
1338 my @logins; 1462 my @logins;
1339 1463
1340 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1344 1473
1345 utf8::decode $login; 1474 utf8::decode $login;
1346 push @logins, $login; 1475 push @logins, $login;
1347 } 1476 }
1348 1477
1386sub expand_cfpod { 1515sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1388 1517
1389 # escape & and < 1518 # escape & and <
1390 s/&/&amp;/g; 1519 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1392 1521
1393 # this is buggy, it needs to properly take care of nested <'s 1522 # this is buggy, it needs to properly take care of nested <'s
1394 1523
1395 1 while 1524 1 while
1396 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1530 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1403 }ge 1533 }ge
1404 # replace H<hint text> 1534 # replace H<hint text>
1412 1542
1413 # create single paragraphs (very hackish) 1543 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1544 s/(?<=\S)\n(?=\w)/ /g;
1415 1545
1416 # compress some whitespace 1546 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1418 1551
1419 $_ 1552 $_
1420} 1553}
1421 1554
1422sub hintmode { 1555sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1557 $_[0]{hintmode}
1425} 1558}
1426 1559
1427=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1428 1561
1429Sends an ext reply to the player. 1562Sends an ext reply to the player.
1430 1563
1431=cut 1564=cut
1432 1565
1433sub ext_reply($$%) { 1566sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1435 1568
1436 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1570}
1439 1571
1440=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1441 1573
1442Sends an ext event to the client. 1574Sends an ext event to the client.
1443 1575
1444=cut 1576=cut
1445 1577
1446sub ext_event($$%) { 1578sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1448 1580
1449 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1450} 1582}
1451 1583
1452=head3 cf::region 1584=head3 cf::region
1453 1585
1454=over 4 1586=over 4
1467 my ($path) = @_; 1599 my ($path) = @_;
1468 1600
1469 my ($match, $specificity); 1601 my ($match, $specificity);
1470 1602
1471 for my $region (list) { 1603 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1604 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1605 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1606 if $region->specificity > $specificity;
1475 } 1607 }
1476 } 1608 }
1477 1609
1597 $self->init; # pass $1 etc. 1729 $self->init; # pass $1 etc.
1598 return $self; 1730 return $self;
1599 } 1731 }
1600 } 1732 }
1601 1733
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1734 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1735 ()
1604} 1736}
1605 1737
1606sub init { 1738sub init {
1607 my ($self) = @_; 1739 my ($self) = @_;
1670 1802
1671sub load_header_from($) { 1803sub load_header_from($) {
1672 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1673 1805
1674 utf8::encode $path; 1806 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1680 1815
1681 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1682 1817
1683 1 1818 1
1684} 1819}
1738sub find { 1873sub find {
1739 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1740 1875
1741 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1742 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1744 1880
1745 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1746 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1747 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1748 or return; 1886 or return;
1749 1887
1750 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1751 1889
1753 or return; 1891 or return;
1754 1892
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1758 $map->reset; 1898 $map->reset;
1759 undef $guard;
1760 return find $path; 1899 return find $path;
1761 } 1900 }
1762 1901
1763 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1764 } 1903 }
1773 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1774 1913
1775 my $path = $self->{path}; 1914 my $path = $self->{path};
1776 1915
1777 { 1916 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1779 1918
1919 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 1921
1782 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1783 1923
1784 $self->alloc; 1924 $self->alloc;
1785 1925
1786 $self->pre_load; 1926 $self->pre_load;
1787 Coro::cede; 1927 cf::cede_to_tick;
1788 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1790 or return; 1932 or return;
1791 1933
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1794 1936
1795 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 1938 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 1941 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1800 } 1945 }
1801 } 1946 }
1802 1947
1803 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1804 # now do the right thing for maps 1951 # now do the right thing for maps
1805 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 1954 unless $self->difficulty;
1808 Coro::cede; 1955 cf::cede_to_tick;
1809 1956
1810 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 1958 $self->decay_objects;
1812 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1813 $self->update_buttons; 1960 $self->update_buttons;
1814 Coro::cede; 1961 cf::cede_to_tick;
1815 $self->set_darkness_map; 1962 $self->set_darkness_map;
1816 Coro::cede; 1963 cf::cede_to_tick;
1817 $self->activate; 1964 $self->activate;
1818 } 1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1819 1969
1820 $self->in_memory (cf::MAP_IN_MEMORY); 1970 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 1971 }
1822 1972
1823 $self->post_load; 1973 $self->post_load;
1834 1984
1835 $self 1985 $self
1836} 1986}
1837 1987
1838# find and load all maps in the 3x3 area around a map 1988# find and load all maps in the 3x3 area around a map
1839sub load_diag { 1989sub load_neighbours {
1840 my ($map) = @_; 1990 my ($map) = @_;
1841 1991
1842 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1843 1993
1844 for (0 .. 3) { 1994 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1846 or next; 1996 or next;
1847 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1848 or next; 1998 or next;
1849 $neigh->load; 1999 $neigh->load;
1850 2000
2001 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2004 }
1854 2005
1855 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1857 or next; 2009 or next;
1858 $neigh->load; 2010 $neigh->load;
1859 } 2011 }
1860} 2012}
1861 2013
1866} 2018}
1867 2019
1868sub do_load_sync { 2020sub do_load_sync {
1869 my ($map) = @_; 2021 my ($map) = @_;
1870 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1871 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1872} 2027}
1873 2028
1874our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1876 2031
1877sub find_async { 2032sub find_async {
1878 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1879 2034
1880 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1881 2036
1882 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1884 } 2039 }
1885 2040
1886 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1887 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1888 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2048 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2049 $map->load if $v;
2050 }
1893 2051
1894 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1895 } 2053 }
1896 } 2054 }
1897 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1898 }; 2056 };
1899 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
1902} 2060}
1903 2061
1904sub save { 2062sub save {
1905 my ($self) = @_; 2063 my ($self) = @_;
1906 2064
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2066
1909 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1910 2068
1911 return unless $self->dirty; 2069 return unless $self->dirty;
1912 2070
1918 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1919 2077
1920 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1921 2079
1922 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
1924 }; 2083 };
1925 2084
1926 if ($uniq) { 2085 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1935 my ($self) = @_; 2094 my ($self) = @_;
1936 2095
1937 # save first because save cedes 2096 # save first because save cedes
1938 $self->save; 2097 $self->save;
1939 2098
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2100
1942 return if $self->players; 2101 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
1944 return if $self->{deny_save}; 2103 return if $self->{deny_save};
1945 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2109 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2110}
1949 2111
1950sub reset_at { 2112sub reset_at {
1951 my ($self) = @_; 2113 my ($self) = @_;
1952 2114
1984 if $uniq; 2146 if $uniq;
1985 } 2147 }
1986 2148
1987 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
1988 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2153 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2154
1993 $self->unlink_save; 2155 $self->unlink_save;
1994 $self->destroy; 2156 $self->destroy;
1995} 2157}
1996 2158
1997my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
1998 2160
1999sub nuke { 2161sub nuke {
2000 my ($self) = @_; 2162 my ($self) = @_;
2001 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2002 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2003 2168
2004 $self->unlink_save; 2169 $self->unlink_save;
2005 2170
2006 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2176
2012 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2013 2179
2014 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2015} 2181}
2016 2182
2017=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
2093 2259
2094sub inv_recursive { 2260sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2096} 2262}
2097 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
2293}
2294
2098package cf; 2295package cf;
2099 2296
2100=back 2297=back
2101 2298
2102=head3 cf::object::player 2299=head3 cf::object::player
2124 2321
2125 } else { 2322 } else {
2126 my $pl = $self->contr; 2323 my $pl = $self->contr;
2127 2324
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2325 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2326 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2328
2137 } else { 2329 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2330 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2331 $self->message ($msg, $flags);
2140 } 2332 }
2141 } 2333 }
2334}
2335
2336=item $object->send_msg ($channel, $msg, $color, [extra...])
2337
2338=cut
2339
2340sub cf::object::send_msg {
2341 my $pl = shift->contr
2342 or return;
2343 $pl->send_msg (@_);
2142} 2344}
2143 2345
2144=item $player_object->may ("access") 2346=item $player_object->may ("access")
2145 2347
2146Returns wether the given player is authorized to access resource "access" 2348Returns wether the given player is authorized to access resource "access"
2225 # use -1 or undef as default coordinates, not 0, 0 2427 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2428 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2429 if $x <=0 && $y <= 0;
2228 2430
2229 $map->load; 2431 $map->load;
2230 $map->load_diag; 2432 $map->load_neighbours;
2231 2433
2232 return unless $self->contr->active; 2434 return unless $self->contr->active;
2233 $self->activate_recursive; 2435 $self->activate_recursive;
2234 2436
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2438 $self->enter_map ($map, $x, $y);
2237} 2439}
2238 2440
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2442
2241Moves the player to the given map-path and coordinates by first freezing 2443Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2444her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2445that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2446the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process.
2245 2448
2246=cut 2449=cut
2247 2450
2248our $GOTOGEN; 2451our $GOTOGEN;
2249 2452
2250sub cf::object::player::goto { 2453sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2454 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2455
2253 # do generation counting so two concurrent goto's will be executed in-order 2456 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2458
2256 $self->enter_link; 2459 $self->enter_link;
2257 2460
2258 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2259 my $map = eval { 2483 my $map = eval {
2260 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2261 2485
2262 if ($map) { 2486 if ($map) {
2263 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2265 } else { 2489 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2491 }
2268 2492
2269 $map 2493 $map
2270 }; 2494 };
2271 2495
2276 2500
2277 if ($gen == $self->{_goto_generation}) { 2501 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2502 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
2280 } 2504 }
2505
2506 $done->() if $done;
2281 })->prio (1); 2507 })->prio (1);
2282} 2508}
2283 2509
2284=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
2285 2511
2354 my $hp = $exit->stats->hp; 2580 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2581 my $sp = $exit->stats->sp;
2356 2582
2357 $self->enter_link; 2583 $self->enter_link;
2358 2584
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2359 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2360 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2593 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2363 2595
2364 1; 2596 1;
2390 2622
2391 utf8::encode $text; 2623 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2624 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2625}
2394 2626
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2627=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2628
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2629Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2630client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2631the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2632the message unless the client supports the msg packet.
2401 2633
2402=cut 2634=cut
2403 2635
2636our %CHANNEL = (
2637 "c/identify" => {
2638 id => "infobox",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "infobox",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2655);
2656
2404sub cf::client::send_msg { 2657sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2659
2407 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2408 2661
2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2663
2664 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2673 } elsif (ref $channel) {
2674 # send meta info to client, if not yet sent
2675 unless (exists $self->{channel}{$channel->{id}}) {
2676 $self->{channel}{$channel->{id}} = $channel;
2677 $self->ext_msg (channel_info => $channel)
2678 if $self->can_msg;
2679 }
2680
2681 $channel = $channel->{id};
2682 }
2683
2684 return unless @extra || length $msg;
2685
2409 if ($self->can_msg) { 2686 if ($self->can_msg) {
2687 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF;
2690
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2691 $self->send_packet ("msg " . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2693 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2694 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones
2696 for ($msg) {
2697 1 while
2698 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2699 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2700 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2701 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2702 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2703 }
2704
2705 $color &= cf::NDI_COLOR_MASK;
2706
2707 utf8::encode $msg;
2708
2423 if (0 && $msg =~ /\[/) { 2709 if (0 && $msg =~ /\[/) {
2710 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2711 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2712 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2713 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2714 $self->send_packet ("drawinfo $color $msg")
2428 } 2715 }
2429 } 2716 }
2430 } 2717 }
2431} 2718}
2432 2719
2433=item $client->ext_event ($type, %msg) 2720=item $client->ext_msg ($type, @msg)
2434 2721
2435Sends an ext event to the client. 2722Sends an ext event to the client.
2436 2723
2437=cut 2724=cut
2438 2725
2439sub cf::client::ext_event($$%) { 2726sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2727 my ($self, $type, @msg) = @_;
2441 2728
2729 if ($self->extcmd == 2) {
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2731 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2732 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 }
2735}
2736
2737=item $client->ext_reply ($msgid, @msg)
2738
2739Sends an ext reply to the client.
2740
2741=cut
2742
2743sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_;
2745
2746 if ($self->extcmd == 2) {
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id;
2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2752 }
2444} 2753}
2445 2754
2446=item $success = $client->query ($flags, "text", \&cb) 2755=item $success = $client->query ($flags, "text", \&cb)
2447 2756
2448Queues a query to the client, calling the given callback with 2757Queues a query to the client, calling the given callback with
2503 my ($ns, $buf) = @_; 2812 my ($ns, $buf) = @_;
2504 2813
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2814 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2815
2507 if (ref $msg) { 2816 if (ref $msg) {
2817 my ($type, $reply, @payload) =
2818 "ARRAY" eq ref $msg
2819 ? @$msg
2820 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2821
2822 my @reply;
2823
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2824 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2825 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 2826 }
2827
2828 $ns->ext_reply ($reply, @reply)
2829 if $reply;
2830
2514 } else { 2831 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2832 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 2833 }
2517 2834
2518 cf::override; 2835 cf::override;
2565our $safe = new Safe "safe"; 2882our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 2883our $safe_hole = new Safe::Hole;
2567 2884
2568$SIG{FPE} = 'IGNORE'; 2885$SIG{FPE} = 'IGNORE';
2569 2886
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2887$safe->permit_only (Opcode::opset qw(
2888 :base_core :base_mem :base_orig :base_math
2889 grepstart grepwhile mapstart mapwhile
2890 sort time
2891));
2571 2892
2572# here we export the classes and methods available to script code 2893# here we export the classes and methods available to script code
2573 2894
2574=pod 2895=pod
2575 2896
2576The following functions and methods are available within a safe environment: 2897The following functions and methods are available within a safe environment:
2577 2898
2578 cf::object contr pay_amount pay_player map 2899 cf::object
2900 contr pay_amount pay_player map x y force_find force_add
2901 insert remove name archname title slaying race decrease_ob_nr
2902
2579 cf::object::player player 2903 cf::object::player
2580 cf::player peaceful 2904 player
2581 cf::map trigger 2905
2906 cf::player
2907 peaceful
2908
2909 cf::map
2910 trigger
2582 2911
2583=cut 2912=cut
2584 2913
2585for ( 2914for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race
2917 decrease_ob_nr)],
2587 ["cf::object::player" => qw(player)], 2918 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2919 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2920 ["cf::map" => qw(trigger)],
2590) { 2921) {
2591 no strict 'refs'; 2922 no strict 'refs';
2667# the server's init and main functions 2998# the server's init and main functions
2668 2999
2669sub load_facedata($) { 3000sub load_facedata($) {
2670 my ($path) = @_; 3001 my ($path) = @_;
2671 3002
3003 # HACK to clear player env face cache, we need some signal framework
3004 # for this (global event?)
3005 %ext::player_env::MUSIC_FACE_CACHE = ();
3006
3007 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3008
2672 warn "loading facedata from $path\n"; 3009 warn "loading facedata from $path\n";
2673 3010
2674 my $facedata; 3011 my $facedata;
2675 0 < aio_load $path, $facedata 3012 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3013 or die "$path: $!";
2678 $facedata = Coro::Storable::thaw $facedata; 3015 $facedata = Coro::Storable::thaw $facedata;
2679 3016
2680 $facedata->{version} == 2 3017 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3018 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3019
3020 # patch in the exptable
3021 $facedata->{resource}{"res/exp_table"} = {
3022 type => FT_RSRC,
3023 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3024 };
3025 cf::cede_to_tick;
3026
2683 { 3027 {
2684 my $faces = $facedata->{faceinfo}; 3028 my $faces = $facedata->{faceinfo};
2685 3029
2686 while (my ($face, $info) = each %$faces) { 3030 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3031 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3032 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3036
3037 cf::cede_to_tick;
2692 } 3038 }
2693 3039
2694 while (my ($face, $info) = each %$faces) { 3040 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3041 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 3042 my $idx = cf::face::find $face
2697 or next; 3043 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3044 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3047 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3048 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3049 }
2703 Coro::cede; 3050
3051 cf::cede_to_tick;
2704 } 3052 }
2705 } 3053 }
2706 3054
2707 { 3055 {
2708 my $anims = $facedata->{animinfo}; 3056 my $anims = $facedata->{animinfo};
2709 3057
2710 while (my ($anim, $info) = each %$anims) { 3058 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3059 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3060 cf::cede_to_tick;
2713 } 3061 }
2714 3062
2715 cf::anim::invalidate_all; # d'oh 3063 cf::anim::invalidate_all; # d'oh
2716 } 3064 }
2717 3065
3066 {
3067 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource};
3070
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) {
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data;
3076
3077 if ($info->{type} & 1) {
3078 # prepend meta info
3079
3080 my $meta = $enc->encode ({
3081 name => $name,
3082 %{ $info->{meta} || {} },
3083 });
3084
3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else {
3087 $data = $info->{data};
3088 }
3089
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick;
3094 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 }
3114
2718 1 3115 1
2719} 3116}
2720 3117
3118register_exticmd fx_want => sub {
3119 my ($ns, $want) = @_;
3120
3121 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v);
3123 }
3124};
3125
2721sub reload_regions { 3126sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = ();
3130
2722 load_resource_file "$MAPDIR/regions" 3131 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3132 or die "unable to load regions file\n";
3133
3134 for (cf::region::list) {
3135 $_->{match} = qr/$_->{match}/
3136 if exists $_->{match};
3137 }
2724} 3138}
2725 3139
2726sub reload_facedata { 3140sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3141 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3142 or die "unable to load facedata\n";
2757 3171
2758sub init { 3172sub init {
2759 reload_resources; 3173 reload_resources;
2760} 3174}
2761 3175
2762sub cfg_load { 3176sub reload_config {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3177 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3178 or return;
2765 3179
2766 local $/; 3180 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3181 *CFG = YAML::Syck::Load <$fh>;
2783sub main { 3197sub main {
2784 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
2788 Event::one_event; 3203 Event::one_event;
2789 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
2790 }; 3205 };
2791 3206
2792 cfg_load; 3207 reload_config;
2793 db_init; 3208 db_init;
2794 load_extensions; 3209 load_extensions;
2795 3210
2796 $TICK_WATCHER->start; 3211 $TICK_WATCHER->start;
2797 Event::loop; 3212 Event::loop;
2990 warn "reloading cf.pm"; 3405 warn "reloading cf.pm";
2991 require cf; 3406 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3408
2994 warn "loading config and database again"; 3409 warn "loading config and database again";
2995 cf::cfg_load; 3410 cf::reload_config;
2996 3411
2997 warn "loading extensions"; 3412 warn "loading extensions";
2998 cf::load_extensions; 3413 cf::load_extensions;
2999 3414
3000 warn "reattaching attachments to objects/players"; 3415 warn "reattaching attachments to objects/players";
3036register_command "reload" => sub { 3451register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3038 3453
3039 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3458 reload_perl;
3459 };
3042 } 3460 }
3043}; 3461};
3044 3462
3045unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3046 3464
3065 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3485 $signal->wait;
3068} 3486}
3069 3487
3070 my $min = 1e6;#d#
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3073 reentrant => 0, 3489 reentrant => 0,
3074 parked => 1, 3490 parked => 1,
3075 prio => 0, 3491 prio => 0,
3076 at => $NEXT_TICK || $TICK, 3492 at => $NEXT_TICK || $TICK,
3084 3500
3085 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3086 3502
3087 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3088 3504
3089 0 && sync_job {#d#
3090 for(1..10) {
3091 my $t = Event::time;
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3093 or die;
3094
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 };
3111
3112 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3114 3507
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3118 write_runtime 3512 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3120 }; 3514 };
3121 } 3515 }
3122 3516
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3518 $sig->send;
3128 } 3519 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3521 $sig->send;
3140 3531
3141 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3534
3144 _post_tick; 3535 _post_tick;
3145
3146
3147 }, 3536 },
3148); 3537);
3149 3538
3150{ 3539{
3540 BDB::min_parallel 8;
3151 BDB::max_poll_time $TICK * 0.1; 3541 BDB::max_poll_time $TICK * 0.1;
3152 $BDB_POLL_WATCHER = Event->io ( 3542 $BDB_POLL_WATCHER = Event->io (
3153 reentrant => 0, 3543 reentrant => 0,
3154 fd => BDB::poll_fileno, 3544 fd => BDB::poll_fileno,
3155 poll => 'r', 3545 poll => 'r',
3156 prio => 0, 3546 prio => 0,
3157 data => WF_AUTOCANCEL, 3547 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb, 3548 cb => \&BDB::poll_cb,
3159 ); 3549 );
3160 BDB::min_parallel 8;
3161 3550
3162 BDB::set_sync_prepare { 3551 BDB::set_sync_prepare {
3163 my $status; 3552 my $status;
3164 my $current = $Coro::current; 3553 my $current = $Coro::current;
3165 ( 3554 (
3174 ) 3563 )
3175 }; 3564 };
3176 3565
3177 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3567 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3572
3180 cf::sync_job { 3573 cf::sync_job {
3181 eval { 3574 eval {
3182 BDB::db_env_open 3575 BDB::db_env_open
3183 $DB_ENV, 3576 $DB_ENV,
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3580 0666;
3188 3581
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3583 };
3194 3584
3195 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3586 };
3197 } 3587 }
3588
3589 $BDB_DEADLOCK_WATCHER = Event->timer (
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 );
3599 $BDB_CHECKPOINT_WATCHER = Event->timer (
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 );
3609 $BDB_TRICKLE_WATCHER = Event->timer (
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 );
3198} 3619}
3199 3620
3200{ 3621{
3201 IO::AIO::min_parallel 8; 3622 IO::AIO::min_parallel 8;
3202 3623
3221 3642
3222 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3645 ++$_log_backtrace;
3225 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3226 my @bt = fork_call { 3649 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3652 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines