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.371 by root, Thu Sep 13 16:16:01 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
960); 1026);
961 1027
962sub object_freezer_save { 1028sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
964 1030
1031 my $guard = cf::lock_acquire "io";
1032
965 sync_job { 1033 sync_job {
966 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
969 1038
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
992 } 1061 }
993 } else { 1062 } else {
994 aio_unlink $filename; 1063 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
996 } 1065 }
997 } 1066 };
1067
1068 undef $guard;
998} 1069}
999 1070
1000sub object_freezer_as_string { 1071sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1002 1073
1007 1078
1008sub object_thawer_load { 1079sub object_thawer_load {
1009 my ($filename) = @_; 1080 my ($filename) = @_;
1010 1081
1011 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1012 1085
1013 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1014 or return; 1087 or return;
1015 1088
1016 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1091 or return;
1092
1093 undef $guard;
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1020 } 1095 }
1021 1096
1097 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1024 return ($data, $av); 1101 ($data, $av)
1025} 1102}
1026 1103
1027=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1028 1105
1029=over 4 1106=over 4
1102 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1103 1180
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1182
1106 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1112 } else { 1198 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1200 }
1115 1201
1116 cf::override; 1202 cf::override;
1206 1292
1207=head3 cf::player 1293=head3 cf::player
1208 1294
1209=over 4 1295=over 4
1210 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1211=item cf::player::find $login 1311=item cf::player::find $login
1212 1312
1213Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1214 1314
1215=cut 1315=cut
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1354
1255 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1258 } 1364 }
1259 } 1365 }
1260} 1366}
1261 1367
1271 1377
1272 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1274 1380
1275 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1276 Coro::cede; 1382 cf::cede_to_tick;
1277} 1383}
1278 1384
1279sub new($) { 1385sub new($) {
1280 my ($login) = @_; 1386 my ($login) = @_;
1281 1387
1285 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1286 1392
1287 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1288 1394
1289 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1290} 1406}
1291 1407
1292=item $pl->quit_character 1408=item $pl->quit_character
1293 1409
1294Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1349 or return []; 1465 or return [];
1350 1466
1351 my @logins; 1467 my @logins;
1352 1468
1353 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1357 1478
1358 utf8::decode $login; 1479 utf8::decode $login;
1359 push @logins, $login; 1480 push @logins, $login;
1360 } 1481 }
1361 1482
1399sub expand_cfpod { 1520sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1401 1522
1402 # escape & and < 1523 # escape & and <
1403 s/&/&amp;/g; 1524 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1405 1526
1406 # this is buggy, it needs to properly take care of nested <'s 1527 # this is buggy, it needs to properly take care of nested <'s
1407 1528
1408 1 while 1529 1 while
1409 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1535 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1416 }ge 1538 }ge
1417 # replace H<hint text> 1539 # replace H<hint text>
1438sub hintmode { 1560sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1562 $_[0]{hintmode}
1441} 1563}
1442 1564
1443=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1444 1566
1445Sends an ext reply to the player. 1567Sends an ext reply to the player.
1446 1568
1447=cut 1569=cut
1448 1570
1449sub ext_reply($$%) { 1571sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1451 1573
1452 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1575}
1455 1576
1456=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1457 1578
1458Sends an ext event to the client. 1579Sends an ext event to the client.
1459 1580
1460=cut 1581=cut
1461 1582
1462sub ext_event($$%) { 1583sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1464 1585
1465 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1466} 1587}
1467 1588
1468=head3 cf::region 1589=head3 cf::region
1469 1590
1470=over 4 1591=over 4
1483 my ($path) = @_; 1604 my ($path) = @_;
1484 1605
1485 my ($match, $specificity); 1606 my ($match, $specificity);
1486 1607
1487 for my $region (list) { 1608 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1609 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1610 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1611 if $region->specificity > $specificity;
1491 } 1612 }
1492 } 1613 }
1493 1614
1613 $self->init; # pass $1 etc. 1734 $self->init; # pass $1 etc.
1614 return $self; 1735 return $self;
1615 } 1736 }
1616 } 1737 }
1617 1738
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1739 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1740 ()
1620} 1741}
1621 1742
1622sub init { 1743sub init {
1623 my ($self) = @_; 1744 my ($self) = @_;
1686 1807
1687sub load_header_from($) { 1808sub load_header_from($) {
1688 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1689 1810
1690 utf8::encode $path; 1811 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1696 1820
1697 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1698 1822
1699 1 1823 1
1700} 1824}
1754sub find { 1878sub find {
1755 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1756 1880
1757 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1758 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1760 1885
1761 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1763 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1764 or return; 1891 or return;
1765 1892
1766 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1767 1894
1769 or return; 1896 or return;
1770 1897
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1774 $map->reset; 1903 $map->reset;
1775 undef $guard;
1776 return find $path; 1904 return find $path;
1777 } 1905 }
1778 1906
1779 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1780 } 1908 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1790 1918
1791 my $path = $self->{path}; 1919 my $path = $self->{path};
1792 1920
1793 { 1921 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1795 1923
1924 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 1926
1798 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1799 1928
1800 $self->alloc; 1929 $self->alloc;
1801 1930
1802 $self->pre_load; 1931 $self->pre_load;
1803 Coro::cede; 1932 cf::cede_to_tick;
1804 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1806 or return; 1937 or return;
1807 1938
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1810 1941
1811 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 1943 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 1946 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1816 } 1950 }
1817 } 1951 }
1818 1952
1819 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1820 # now do the right thing for maps 1956 # now do the right thing for maps
1821 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1959 unless $self->difficulty;
1824 Coro::cede; 1960 cf::cede_to_tick;
1825 1961
1826 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1963 $self->decay_objects;
1828 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1829 $self->update_buttons; 1965 $self->update_buttons;
1830 Coro::cede; 1966 cf::cede_to_tick;
1831 $self->set_darkness_map; 1967 $self->set_darkness_map;
1832 Coro::cede; 1968 cf::cede_to_tick;
1833 $self->activate; 1969 $self->activate;
1834 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1835 1974
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1976 }
1838 1977
1839 $self->post_load; 1978 $self->post_load;
1850 1989
1851 $self 1990 $self
1852} 1991}
1853 1992
1854# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1855sub load_diag { 1994sub load_neighbours {
1856 my ($map) = @_; 1995 my ($map) = @_;
1857 1996
1858 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1859 1998
1860 for (0 .. 3) { 1999 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1862 or next; 2001 or next;
1863 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1864 or next; 2003 or next;
1865 $neigh->load; 2004 $neigh->load;
1866 2005
2006 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2009 }
1870 2010
1871 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1873 or next; 2014 or next;
1874 $neigh->load; 2015 $neigh->load;
1875 } 2016 }
1876} 2017}
1877 2018
1882} 2023}
1883 2024
1884sub do_load_sync { 2025sub do_load_sync {
1885 my ($map) = @_; 2026 my ($map) = @_;
1886 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1887 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1888} 2032}
1889 2033
1890our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1892 2036
1893sub find_async { 2037sub find_async {
1894 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1895 2039
1896 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1897 2041
1898 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2044 }
1901 2045
1902 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1903 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2051 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2052 $map->load if $v;
2053 }
1909 2054
1910 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1911 } 2056 }
1912 } 2057 }
1913 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1914 }; 2059 };
1915 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1918} 2063}
1919 2064
1920sub save { 2065sub save {
1921 my ($self) = @_; 2066 my ($self) = @_;
1922 2067
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2069
1925 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
1926 2071
1927 return unless $self->dirty; 2072 return unless $self->dirty;
1928 2073
1951 my ($self) = @_; 2096 my ($self) = @_;
1952 2097
1953 # save first because save cedes 2098 # save first because save cedes
1954 $self->save; 2099 $self->save;
1955 2100
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2102
1958 return if $self->players; 2103 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2105 return if $self->{deny_save};
1961 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2111 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2112}
1965 2113
1966sub reset_at { 2114sub reset_at {
1967 my ($self) = @_; 2115 my ($self) = @_;
1968 2116
2000 if $uniq; 2148 if $uniq;
2001 } 2149 }
2002 2150
2003 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2004 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2155 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2156
2009 $self->unlink_save; 2157 $self->unlink_save;
2010 $self->destroy; 2158 $self->destroy;
2011} 2159}
2012 2160
2013my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2014 2162
2015sub nuke { 2163sub nuke {
2016 my ($self) = @_; 2164 my ($self) = @_;
2017 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2018 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2019 2170
2020 $self->unlink_save; 2171 $self->unlink_save;
2021 2172
2022 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2178
2028 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2029 2181
2030 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2031} 2183}
2032 2184
2033=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
2109 2261
2110sub inv_recursive { 2262sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2112} 2264}
2113 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
2295}
2296
2114package cf; 2297package cf;
2115 2298
2116=back 2299=back
2117 2300
2118=head3 cf::object::player 2301=head3 cf::object::player
2140 2323
2141 } else { 2324 } else {
2142 my $pl = $self->contr; 2325 my $pl = $self->contr;
2143 2326
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2327 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2328 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2329 $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 2330
2153 } else { 2331 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2156 } 2334 }
2157 } 2335 }
2336}
2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
2158} 2346}
2159 2347
2160=item $player_object->may ("access") 2348=item $player_object->may ("access")
2161 2349
2162Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
2244 2432
2245 $map->load; 2433 $map->load;
2246 $map->load_diag; 2434 $map->load_neighbours;
2247 2435
2248 return unless $self->contr->active; 2436 return unless $self->contr->active;
2249 $self->activate_recursive; 2437 $self->activate_recursive;
2250 2438
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2440 $self->enter_map ($map, $x, $y);
2253} 2441}
2254 2442
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2444
2257Moves the player to the given map-path and coordinates by first freezing 2445Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2446her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2447that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2448the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process.
2261 2450
2262=cut 2451=cut
2263 2452
2264our $GOTOGEN; 2453our $GOTOGEN;
2265 2454
2266sub cf::object::player::goto { 2455sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2456 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2457
2269 # do generation counting so two concurrent goto's will be executed in-order 2458 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2460
2272 $self->enter_link; 2461 $self->enter_link;
2273 2462
2274 (async { 2463 (async {
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
2275 my $map = eval { 2483 my $map = eval {
2276 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2277 2485
2278 if ($map) { 2486 if ($map) {
2279 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2281 } else { 2489 } else {
2282 $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);
2283 } 2491 }
2284 2492
2285 $map 2493 $map
2286 }; 2494 };
2287 2495
2292 2500
2293 if ($gen == $self->{_goto_generation}) { 2501 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2502 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
2296 } 2504 }
2505
2506 $done->() if $done;
2297 })->prio (1); 2507 })->prio (1);
2298} 2508}
2299 2509
2300=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
2301 2511
2410 2620
2411 utf8::encode $text; 2621 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2623}
2414 2624
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2625=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2626
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2627Send 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 2628client 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 2629the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2421 2631
2422=cut 2632=cut
2423 2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2424sub cf::client::send_msg { 2649sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2651
2427 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2428 2653
2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2658
2659 if (ref $channel) {
2660 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2665 }
2666
2667 $channel = $channel->{id};
2668 }
2669
2429 return unless @extra || length $msg; 2670 return unless @extra || length $msg;
2430 2671
2431 if ($self->can_msg) { 2672 if ($self->can_msg) {
2673 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF;
2676
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2677 $self->send_packet ("msg " . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2679 } 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) { 2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690
2691 $color &= cf::NDI_COLOR_MASK;
2692
2693 utf8::encode $msg;
2694
2445 if (0 && $msg =~ /\[/) { 2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2698 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2700 $self->send_packet ("drawinfo $color $msg")
2450 } 2701 }
2451 } 2702 }
2452 } 2703 }
2453} 2704}
2454 2705
2455=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2456 2707
2457Sends an ext event to the client. 2708Sends an ext event to the client.
2458 2709
2459=cut 2710=cut
2460 2711
2461sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2463 2714
2715 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2466} 2739}
2467 2740
2468=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2469 2742
2470Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 2798 my ($ns, $buf) = @_;
2526 2799
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2800 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2801
2529 if (ref $msg) { 2802 if (ref $msg) {
2803 my ($type, $reply, @payload) =
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807
2808 my @reply;
2809
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2810 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2811 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2536 } else { 2817 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2819 }
2539 2820
2540 cf::override; 2821 cf::override;
2587our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2589 2870
2590$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2591 2872
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2873$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math
2875 grepstart grepwhile mapstart mapwhile
2876 sort time
2877));
2593 2878
2594# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2595 2880
2596=pod 2881=pod
2597 2882
2598The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2599 2884
2600 cf::object 2885 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2886 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2887 insert remove name archname title slaying race decrease_ob_nr
2603 2888
2604 cf::object::player 2889 cf::object::player
2605 player 2890 player
2606 2891
2607 cf::player 2892 cf::player
2612 2897
2613=cut 2898=cut
2614 2899
2615for ( 2900for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race
2617 insert remove)], 2903 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2621) { 2907) {
2622 no strict 'refs'; 2908 no strict 'refs';
2698# the server's init and main functions 2984# the server's init and main functions
2699 2985
2700sub load_facedata($) { 2986sub load_facedata($) {
2701 my ($path) = @_; 2987 my ($path) = @_;
2702 2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994
2703 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2704 2996
2705 my $facedata; 2997 my $facedata;
2706 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2999 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2710 3002
2711 $facedata->{version} == 2 3003 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
3012
2714 { 3013 {
2715 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2716 3015
2717 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3018 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3022
3023 cf::cede_to_tick;
2723 } 3024 }
2724 3025
2725 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3027 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 3028 my $idx = cf::face::find $face
2728 or next; 3029 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3030 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3033 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3034 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3035 }
2734 Coro::cede; 3036
3037 cf::cede_to_tick;
2735 } 3038 }
2736 } 3039 }
2737 3040
2738 { 3041 {
2739 my $anims = $facedata->{animinfo}; 3042 my $anims = $facedata->{animinfo};
2740 3043
2741 while (my ($anim, $info) = each %$anims) { 3044 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3045 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3046 cf::cede_to_tick;
2744 } 3047 }
2745 3048
2746 cf::anim::invalidate_all; # d'oh 3049 cf::anim::invalidate_all; # d'oh
2747 } 3050 }
2748 3051
3052 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource};
3056
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062
3063 if ($info->{type} & 1) {
3064 # prepend meta info
3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else {
3073 $data = $info->{data};
3074 }
3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick;
3080 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 }
3100
2749 1 3101 1
2750} 3102}
2751 3103
3104register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_;
3106
3107 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v);
3109 }
3110};
3111
2752sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2753 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
3119
3120 for (cf::region::list) {
3121 $_->{match} = qr/$_->{match}/
3122 if exists $_->{match};
3123 }
2755} 3124}
2756 3125
2757sub reload_facedata { 3126sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3127 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3128 or die "unable to load facedata\n";
2788 3157
2789sub init { 3158sub init {
2790 reload_resources; 3159 reload_resources;
2791} 3160}
2792 3161
2793sub cfg_load { 3162sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3164 or return;
2796 3165
2797 local $/; 3166 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2818 (async { 3187 (async {
2819 Event::one_event; 3188 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2821 }; 3190 };
2822 3191
2823 cfg_load; 3192 reload_config;
2824 db_init; 3193 db_init;
2825 load_extensions; 3194 load_extensions;
2826 3195
2827 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2828 Event::loop; 3197 Event::loop;
3021 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
3022 require cf; 3391 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3393
3025 warn "loading config and database again"; 3394 warn "loading config and database again";
3026 cf::cfg_load; 3395 cf::reload_config;
3027 3396
3028 warn "loading extensions"; 3397 warn "loading extensions";
3029 cf::load_extensions; 3398 cf::load_extensions;
3030 3399
3031 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
3096 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3467 $signal->wait;
3099} 3468}
3100 3469
3101 my $min = 1e6;#d#
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3104 reentrant => 0, 3471 reentrant => 0,
3105 parked => 1, 3472 parked => 1,
3106 prio => 0, 3473 prio => 0,
3107 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
3115 3482
3116 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3117 3484
3118 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3119 3486
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; 3487 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3145 3489
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
3149 write_runtime 3493 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3151 }; 3495 };
3152 } 3496 }
3153 3497
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3499 $sig->send;
3159 } 3500 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3502 $sig->send;
3171 3512
3172 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3515
3175 _post_tick; 3516 _post_tick;
3176
3177
3178 }, 3517 },
3179); 3518);
3180 3519
3181{ 3520{
3521 BDB::min_parallel 8;
3182 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3183 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3184 reentrant => 0, 3524 reentrant => 0,
3185 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3186 poll => 'r', 3526 poll => 'r',
3187 prio => 0, 3527 prio => 0,
3188 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3190 ); 3530 );
3191 BDB::min_parallel 8;
3192 3531
3193 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3194 my $status; 3533 my $status;
3195 my $current = $Coro::current; 3534 my $current = $Coro::current;
3196 ( 3535 (
3205 ) 3544 )
3206 }; 3545 };
3207 3546
3208 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 3553
3211 cf::sync_job { 3554 cf::sync_job {
3212 eval { 3555 eval {
3213 BDB::db_env_open 3556 BDB::db_env_open
3214 $DB_ENV, 3557 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3561 0666;
3219 3562
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 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 }; 3564 };
3225 3565
3226 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3567 };
3228 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3229} 3600}
3230 3601
3231{ 3602{
3232 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3233 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines