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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 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 my $signal = new Coro::Signal;
360
361 while () {
362 next_job:
363 my $avail = cf::till_tick;
364 if ($avail > 0.01) {
365 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) {
367 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send;
369 Coro::cede;
370 goto next_job;
371 }
372 }
373 }
374
375 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait;
379 } else {
380 Coro::schedule;
381 }
382 }
383};
384
385sub get_slot($;$$) {
386 my ($time, $pri, $name) = @_;
387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready;
394 $sig->wait;
318} 395}
319 396
320=item cf::async { BLOCK } 397=item cf::async { BLOCK }
321 398
322Currently the same as Coro::async_pool, meaning you cannot use 399Currently the same as Coro::async_pool, meaning you cannot use
412=cut 489=cut
413 490
414sub fork_call(&@) { 491sub fork_call(&@) {
415 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
416 493
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 497
422 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 499 reset_signals;
436 local $SIG{__WARN__}; 500 &$cb
437 local $SIG{__DIE__}; 501 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 502
443 my @res = eval { $cb->(@args) }; 503 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 504}
461 505
462=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
463 507
464Returns a single value from the environment database. 508Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
467 511
468Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
469data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
470 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
471=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
472 538
473our $DB; 539our $DB;
474 540
475sub db_init { 541sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 542 cf::sync_job {
480 eval { 543 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 544 };
490} 545}
491 546
492sub db_get($$) { 547sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
494 549
544 if (1) { 599 if (1) {
545 $md5 = 600 $md5 =
546 join "\x00", 601 join "\x00",
547 $processversion, 602 $processversion,
548 map { 603 map {
549 Coro::cede; 604 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 606 } 0.. $#$src;
552 607
553 608
554 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
860 "; 915 ";
861 die if $@; 916 die if $@;
862} 917}
863 918
864our $override; 919our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 920our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 921
867sub override { 922sub override {
868 $override = 1; 923 $override = 1;
869 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
870} 925}
871 926
872sub do_invoke { 927sub do_invoke {
873 my $event = shift; 928 my $event = shift;
874 my $callbacks = shift; 929 my $callbacks = shift;
875 930
876 @invoke_results = (); 931 @INVOKE_RESULTS = ();
877 932
878 local $override; 933 local $override;
879 934
880 for (@$callbacks) { 935 for (@$callbacks) {
881 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
898 953
899Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
900 955
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 956This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 957removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 959
905=back 960=back
906 961
907=cut 962=cut
908 963
909############################################################################# 964#############################################################################
910# object support 965# object support
966#
967
968sub _can_merge {
969 my ($ob1, $ob2) = @_;
970
971 local $Storable::canonical = 1;
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974
975 $fob1 eq $fob2
976}
911 977
912sub reattach { 978sub reattach {
913 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 980 my ($obj) = @_;
915 981
962sub object_freezer_save { 1028sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
964 1030
965 sync_job { 1031 sync_job {
966 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
969 1036
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
992 } 1059 }
993 } else { 1060 } else {
994 aio_unlink $filename; 1061 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
996 } 1063 }
997 } 1064 };
998} 1065}
999 1066
1000sub object_freezer_as_string { 1067sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1002 1069
1014 or return; 1081 or return;
1015 1082
1016 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1085 or return;
1086
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1020 } 1088 }
1021 1089
1090 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1024 return ($data, $av); 1094 ($data, $av)
1025} 1095}
1026 1096
1027=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1028 1098
1029=over 4 1099=over 4
1102 my ($pl, $buf) = @_; 1172 my ($pl, $buf) = @_;
1103 1173
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1174 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1175
1106 if (ref $msg) { 1176 if (ref $msg) {
1177 my ($type, $reply, @payload) =
1178 "ARRAY" eq ref $msg
1179 ? @$msg
1180 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1181
1182 my @reply;
1183
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1184 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1185 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1112 } else { 1191 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1193 }
1115 1194
1116 cf::override; 1195 cf::override;
1206 1285
1207=head3 cf::player 1286=head3 cf::player
1208 1287
1209=over 4 1288=over 4
1210 1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1303
1211=item cf::player::find $login 1304=item cf::player::find $login
1212 1305
1213Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1214 1307
1215=cut 1308=cut
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1347
1255 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1258 } 1356 }
1259 } 1357 }
1260} 1358}
1261 1359
1271 1369
1272 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1274 1372
1275 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1276 Coro::cede; 1374 cf::cede_to_tick;
1277} 1375}
1278 1376
1279sub new($) { 1377sub new($) {
1280 my ($login) = @_; 1378 my ($login) = @_;
1281 1379
1285 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1286 1384
1287 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1288 1386
1289 $self 1387 $self
1388}
1389
1390=item $player->send_msg ($channel, $msg, $color, [extra...])
1391
1392=cut
1393
1394sub send_msg {
1395 my $ns = shift->ns
1396 or return;
1397 $ns->send_msg (@_);
1290} 1398}
1291 1399
1292=item $pl->quit_character 1400=item $pl->quit_character
1293 1401
1294Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1457 or return [];
1350 1458
1351 my @logins; 1459 my @logins;
1352 1460
1353 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1357 1470
1358 utf8::decode $login; 1471 utf8::decode $login;
1359 push @logins, $login; 1472 push @logins, $login;
1360 } 1473 }
1361 1474
1399sub expand_cfpod { 1512sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1401 1514
1402 # escape & and < 1515 # escape & and <
1403 s/&/&amp;/g; 1516 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1405 1518
1406 # this is buggy, it needs to properly take care of nested <'s 1519 # this is buggy, it needs to properly take care of nested <'s
1407 1520
1408 1 while 1521 1 while
1409 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1527 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1416 }ge 1530 }ge
1417 # replace H<hint text> 1531 # replace H<hint text>
1438sub hintmode { 1552sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1554 $_[0]{hintmode}
1441} 1555}
1442 1556
1443=item $player->ext_reply ($msgid, %msg) 1557=item $player->ext_reply ($msgid, @msg)
1444 1558
1445Sends an ext reply to the player. 1559Sends an ext reply to the player.
1446 1560
1447=cut 1561=cut
1448 1562
1449sub ext_reply($$%) { 1563sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1564 my ($self, $id, @msg) = @_;
1451 1565
1452 $msg{msgid} = $id; 1566 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1567}
1455 1568
1456=item $player->ext_event ($type, %msg) 1569=item $player->ext_msg ($type, @msg)
1457 1570
1458Sends an ext event to the client. 1571Sends an ext event to the client.
1459 1572
1460=cut 1573=cut
1461 1574
1462sub ext_event($$%) { 1575sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1576 my ($self, $type, @msg) = @_;
1464 1577
1465 $self->ns->ext_event ($type, %msg); 1578 $self->ns->ext_msg ($type, @msg);
1466} 1579}
1467 1580
1468=head3 cf::region 1581=head3 cf::region
1469 1582
1470=over 4 1583=over 4
1483 my ($path) = @_; 1596 my ($path) = @_;
1484 1597
1485 my ($match, $specificity); 1598 my ($match, $specificity);
1486 1599
1487 for my $region (list) { 1600 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1601 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1602 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1603 if $region->specificity > $specificity;
1491 } 1604 }
1492 } 1605 }
1493 1606
1613 $self->init; # pass $1 etc. 1726 $self->init; # pass $1 etc.
1614 return $self; 1727 return $self;
1615 } 1728 }
1616 } 1729 }
1617 1730
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1731 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1732 ()
1620} 1733}
1621 1734
1622sub init { 1735sub init {
1623 my ($self) = @_; 1736 my ($self) = @_;
1686 1799
1687sub load_header_from($) { 1800sub load_header_from($) {
1688 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1689 1802
1690 utf8::encode $path; 1803 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1696 1812
1697 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1698 1814
1699 1 1815 1
1700} 1816}
1754sub find { 1870sub find {
1755 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1756 1872
1757 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1758 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1760 1877
1761 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1763 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1764 or return; 1883 or return;
1765 1884
1766 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1767 1886
1769 or return; 1888 or return;
1770 1889
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1774 $map->reset; 1895 $map->reset;
1775 undef $guard;
1776 return find $path; 1896 return find $path;
1777 } 1897 }
1778 1898
1779 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1780 } 1900 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1790 1910
1791 my $path = $self->{path}; 1911 my $path = $self->{path};
1792 1912
1793 { 1913 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1795 1915
1916 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 1918
1798 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1799 1920
1800 $self->alloc; 1921 $self->alloc;
1801 1922
1802 $self->pre_load; 1923 $self->pre_load;
1803 Coro::cede; 1924 cf::cede_to_tick;
1804 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1806 or return; 1929 or return;
1807 1930
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1810 1933
1811 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 1935 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 1938 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1816 } 1942 }
1817 } 1943 }
1818 1944
1819 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1820 # now do the right thing for maps 1948 # now do the right thing for maps
1821 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1951 unless $self->difficulty;
1824 Coro::cede; 1952 cf::cede_to_tick;
1825 1953
1826 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1955 $self->decay_objects;
1828 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1829 $self->update_buttons; 1957 $self->update_buttons;
1830 Coro::cede; 1958 cf::cede_to_tick;
1831 $self->set_darkness_map; 1959 $self->set_darkness_map;
1832 Coro::cede; 1960 cf::cede_to_tick;
1833 $self->activate; 1961 $self->activate;
1834 } 1962 }
1963
1964 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME);
1835 1966
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1968 }
1838 1969
1839 $self->post_load; 1970 $self->post_load;
1850 1981
1851 $self 1982 $self
1852} 1983}
1853 1984
1854# find and load all maps in the 3x3 area around a map 1985# find and load all maps in the 3x3 area around a map
1855sub load_diag { 1986sub load_neighbours {
1856 my ($map) = @_; 1987 my ($map) = @_;
1857 1988
1858 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1859 1990
1860 for (0 .. 3) { 1991 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1862 or next; 1993 or next;
1863 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1864 or next; 1995 or next;
1865 $neigh->load; 1996 $neigh->load;
1866 1997
1998 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2001 }
1870 2002
1871 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1873 or next; 2006 or next;
1874 $neigh->load; 2007 $neigh->load;
1875 } 2008 }
1876} 2009}
1877 2010
1882} 2015}
1883 2016
1884sub do_load_sync { 2017sub do_load_sync {
1885 my ($map) = @_; 2018 my ($map) = @_;
1886 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1887 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1888} 2024}
1889 2025
1890our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1892 2028
1893sub find_async { 2029sub find_async {
1894 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1895 2031
1896 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1897 2033
1898 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2036 }
1901 2037
1902 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1903 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2043 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2044 $map->load if $v;
2045 }
1909 2046
1910 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1911 } 2048 }
1912 } 2049 }
1913 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1914 }; 2051 };
1915 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
1918} 2055}
1919 2056
1920sub save { 2057sub save {
1921 my ($self) = @_; 2058 my ($self) = @_;
1922 2059
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2061
1925 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1926 2063
1927 return unless $self->dirty; 2064 return unless $self->dirty;
1928 2065
1951 my ($self) = @_; 2088 my ($self) = @_;
1952 2089
1953 # save first because save cedes 2090 # save first because save cedes
1954 $self->save; 2091 $self->save;
1955 2092
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2094
1958 return if $self->players; 2095 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2097 return if $self->{deny_save};
1961 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2103 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2104}
1965 2105
1966sub reset_at { 2106sub reset_at {
1967 my ($self) = @_; 2107 my ($self) = @_;
1968 2108
2000 if $uniq; 2140 if $uniq;
2001 } 2141 }
2002 2142
2003 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2004 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2147 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2148
2009 $self->unlink_save; 2149 $self->unlink_save;
2010 $self->destroy; 2150 $self->destroy;
2011} 2151}
2012 2152
2013my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2014 2154
2015sub nuke { 2155sub nuke {
2016 my ($self) = @_; 2156 my ($self) = @_;
2017 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2018 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2019 2162
2020 $self->unlink_save; 2163 $self->unlink_save;
2021 2164
2022 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2170
2028 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2029 2173
2030 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2031} 2175}
2032 2176
2033=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
2109 2253
2110sub inv_recursive { 2254sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2112} 2256}
2113 2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
2287}
2288
2114package cf; 2289package cf;
2115 2290
2116=back 2291=back
2117 2292
2118=head3 cf::object::player 2293=head3 cf::object::player
2140 2315
2141 } else { 2316 } else {
2142 my $pl = $self->contr; 2317 my $pl = $self->contr;
2143 2318
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2319 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2320 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2322
2153 } else { 2323 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2324 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2156 } 2326 }
2157 } 2327 }
2328}
2329
2330=item $object->send_msg ($channel, $msg, $color, [extra...])
2331
2332=cut
2333
2334sub cf::object::send_msg {
2335 my $pl = shift->contr
2336 or return;
2337 $pl->send_msg (@_);
2158} 2338}
2159 2339
2160=item $player_object->may ("access") 2340=item $player_object->may ("access")
2161 2341
2162Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2244 2424
2245 $map->load; 2425 $map->load;
2246 $map->load_diag; 2426 $map->load_neighbours;
2247 2427
2248 return unless $self->contr->active; 2428 return unless $self->contr->active;
2249 $self->activate_recursive; 2429 $self->activate_recursive;
2250 2430
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2432 $self->enter_map ($map, $x, $y);
2253} 2433}
2254 2434
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2436
2257Moves the player to the given map-path and coordinates by first freezing 2437Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2438her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2439that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2440the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process.
2261 2442
2262=cut 2443=cut
2263 2444
2264our $GOTOGEN; 2445our $GOTOGEN;
2265 2446
2266sub cf::object::player::goto { 2447sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2448 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2449
2269 # do generation counting so two concurrent goto's will be executed in-order 2450 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2452
2272 $self->enter_link; 2453 $self->enter_link;
2273 2454
2274 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
2462 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2463 $ob = $obs[rand @obs];
2464 } else {
2465 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2466 }
2467 # else put us there anyways for now #d#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
2275 my $map = eval { 2475 my $map = eval {
2276 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2277 2477
2278 if ($map) { 2478 if ($map) {
2279 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2281 } else { 2481 } else {
2282 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2283 } 2483 }
2284 2484
2285 $map 2485 $map
2286 }; 2486 };
2287 2487
2292 2492
2293 if ($gen == $self->{_goto_generation}) { 2493 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2494 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2495 $self->leave_link ($map, $x, $y);
2296 } 2496 }
2497
2498 $done->() if $done;
2297 })->prio (1); 2499 })->prio (1);
2298} 2500}
2299 2501
2300=item $player_object->enter_exit ($exit_object) 2502=item $player_object->enter_exit ($exit_object)
2301 2503
2410 2612
2411 utf8::encode $text; 2613 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2615}
2414 2616
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2617=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2618
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2619Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2620client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2421 2623
2422=cut 2624=cut
2423 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2424sub cf::client::send_msg { 2641sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2643
2427 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2428 2645
2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2650
2651 if (ref $channel) {
2652 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2657 }
2658
2659 $channel = $channel->{id};
2660 }
2661
2429 return unless @extra || length $msg; 2662 return unless @extra || length $msg;
2430 2663
2431 if ($self->can_msg) { 2664 if ($self->can_msg) {
2665 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF;
2668
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2669 $self->send_packet ("msg " . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2671 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682
2683 $color &= cf::NDI_COLOR_MASK;
2684
2685 utf8::encode $msg;
2686
2445 if (0 && $msg =~ /\[/) { 2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2690 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2692 $self->send_packet ("drawinfo $color $msg")
2450 } 2693 }
2451 } 2694 }
2452 } 2695 }
2453} 2696}
2454 2697
2455=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2456 2699
2457Sends an ext event to the client. 2700Sends an ext event to the client.
2458 2701
2459=cut 2702=cut
2460 2703
2461sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2463 2706
2707 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 }
2713}
2714
2715=item $client->ext_reply ($msgid, @msg)
2716
2717Sends an ext reply to the client.
2718
2719=cut
2720
2721sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_;
2723
2724 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 }
2466} 2731}
2467 2732
2468=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2469 2734
2470Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2790 my ($ns, $buf) = @_;
2526 2791
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2792 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2793
2529 if (ref $msg) { 2794 if (ref $msg) {
2795 my ($type, $reply, @payload) =
2796 "ARRAY" eq ref $msg
2797 ? @$msg
2798 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2799
2800 my @reply;
2801
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2802 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2803 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2536 } else { 2809 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2811 }
2539 2812
2540 cf::override; 2813 cf::override;
2587our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2589 2862
2590$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2591 2864
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2865$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math
2867 grepstart grepwhile mapstart mapwhile
2868 sort time
2869));
2593 2870
2594# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2595 2872
2596=pod 2873=pod
2597 2874
2598The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2599 2876
2600 cf::object 2877 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2878 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2879 insert remove name archname title slaying race decrease_ob_nr
2603 2880
2604 cf::object::player 2881 cf::object::player
2605 player 2882 player
2606 2883
2607 cf::player 2884 cf::player
2612 2889
2613=cut 2890=cut
2614 2891
2615for ( 2892for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race
2617 insert remove)], 2895 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2621) { 2899) {
2622 no strict 'refs'; 2900 no strict 'refs';
2698# the server's init and main functions 2976# the server's init and main functions
2699 2977
2700sub load_facedata($) { 2978sub load_facedata($) {
2701 my ($path) = @_; 2979 my ($path) = @_;
2702 2980
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986
2703 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2704 2988
2705 my $facedata; 2989 my $facedata;
2706 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2991 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2710 2994
2711 $facedata->{version} == 2 2995 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2997
2998 # patch in the exptable
2999 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3002 };
3003 cf::cede_to_tick;
3004
2714 { 3005 {
2715 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2716 3007
2717 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3010 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3014
3015 cf::cede_to_tick;
2723 } 3016 }
2724 3017
2725 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3019 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 3020 my $idx = cf::face::find $face
2728 or next; 3021 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3022 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3025 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3026 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3027 }
2734 Coro::cede; 3028
3029 cf::cede_to_tick;
2735 } 3030 }
2736 } 3031 }
2737 3032
2738 { 3033 {
2739 my $anims = $facedata->{animinfo}; 3034 my $anims = $facedata->{animinfo};
2740 3035
2741 while (my ($anim, $info) = each %$anims) { 3036 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3037 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3038 cf::cede_to_tick;
2744 } 3039 }
2745 3040
2746 cf::anim::invalidate_all; # d'oh 3041 cf::anim::invalidate_all; # d'oh
2747 } 3042 }
2748 3043
3044 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource};
3048
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054
3055 if ($info->{type} & 1) {
3056 # prepend meta info
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else {
3065 $data = $info->{data};
3066 }
3067
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick;
3072 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 }
3092
2749 1 3093 1
2750} 3094}
2751 3095
3096register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_;
3098
3099 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v);
3101 }
3102};
3103
2752sub reload_regions { 3104sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = ();
3108
2753 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3110 or die "unable to load regions file\n";
3111
3112 for (cf::region::list) {
3113 $_->{match} = qr/$_->{match}/
3114 if exists $_->{match};
3115 }
2755} 3116}
2756 3117
2757sub reload_facedata { 3118sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3119 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3120 or die "unable to load facedata\n";
2788 3149
2789sub init { 3150sub init {
2790 reload_resources; 3151 reload_resources;
2791} 3152}
2792 3153
2793sub cfg_load { 3154sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3156 or return;
2796 3157
2797 local $/; 3158 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2818 (async { 3179 (async {
2819 Event::one_event; 3180 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2821 }; 3182 };
2822 3183
2823 cfg_load; 3184 reload_config;
2824 db_init; 3185 db_init;
2825 load_extensions; 3186 load_extensions;
2826 3187
2827 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2828 Event::loop; 3189 Event::loop;
3021 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3022 require cf; 3383 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3385
3025 warn "loading config and database again"; 3386 warn "loading config and database again";
3026 cf::cfg_load; 3387 cf::reload_config;
3027 3388
3028 warn "loading extensions"; 3389 warn "loading extensions";
3029 cf::load_extensions; 3390 cf::load_extensions;
3030 3391
3031 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
3096 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3459 $signal->wait;
3099} 3460}
3100 3461
3101 my $min = 1e6;#d#
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3104 reentrant => 0, 3463 reentrant => 0,
3105 parked => 1, 3464 parked => 1,
3106 prio => 0, 3465 prio => 0,
3107 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
3115 3474
3116 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3117 3476
3118 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3119 3478
3120 0 && sync_job {#d#
3121 for(1..10) {
3122 my $t = Event::time;
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124 or die;
3125
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 };
3142
3143 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3145 3481
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3149 write_runtime 3485 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3151 }; 3487 };
3152 } 3488 }
3153 3489
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3491 $sig->send;
3159 } 3492 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3494 $sig->send;
3171 3504
3172 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3507
3175 _post_tick; 3508 _post_tick;
3176
3177
3178 }, 3509 },
3179); 3510);
3180 3511
3181{ 3512{
3513 BDB::min_parallel 8;
3182 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3183 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3184 reentrant => 0, 3516 reentrant => 0,
3185 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3186 poll => 'r', 3518 poll => 'r',
3187 prio => 0, 3519 prio => 0,
3188 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3190 ); 3522 );
3191 BDB::min_parallel 8;
3192 3523
3193 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3194 my $status; 3525 my $status;
3195 my $current = $Coro::current; 3526 my $current = $Coro::current;
3196 ( 3527 (
3205 ) 3536 )
3206 }; 3537 };
3207 3538
3208 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 3545
3211 cf::sync_job { 3546 cf::sync_job {
3212 eval { 3547 eval {
3213 BDB::db_env_open 3548 BDB::db_env_open
3214 $DB_ENV, 3549 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3553 0666;
3219 3554
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3556 };
3225 3557
3226 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3559 };
3228 } 3560 }
3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
3229} 3592}
3230 3593
3231{ 3594{
3232 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3233 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines