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.301 by root, Tue Jul 10 07:01:51 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
409Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
411 488
412=cut 489=cut
413 490
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 491sub fork_call(&@) {
424 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
425 493
426# 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,
427# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 497
431 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 499 reset_signals;
445 local $SIG{__WARN__}; 500 &$cb
446 local $SIG{__DIE__}; 501 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 502
453 eval { 503 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 504}
466 505
467=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
468 507
469Returns a single value from the environment database. 508Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
472 511
473Stores 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
474data 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).
475 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
476=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}
477 538
478our $DB; 539our $DB;
479 540
480sub db_init { 541sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 542 cf::sync_job {
485 eval { 543 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 544 };
495} 545}
496 546
497sub db_get($$) { 547sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
499 549
549 if (1) { 599 if (1) {
550 $md5 = 600 $md5 =
551 join "\x00", 601 join "\x00",
552 $processversion, 602 $processversion,
553 map { 603 map {
554 Coro::cede; 604 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 606 } 0.. $#$src;
557 607
558 608
559 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
865 "; 915 ";
866 die if $@; 916 die if $@;
867} 917}
868 918
869our $override; 919our $override;
870our @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?
871 921
872sub override { 922sub override {
873 $override = 1; 923 $override = 1;
874 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
875} 925}
876 926
877sub do_invoke { 927sub do_invoke {
878 my $event = shift; 928 my $event = shift;
879 my $callbacks = shift; 929 my $callbacks = shift;
880 930
881 @invoke_results = (); 931 @INVOKE_RESULTS = ();
882 932
883 local $override; 933 local $override;
884 934
885 for (@$callbacks) { 935 for (@$callbacks) {
886 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
903 953
904Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
905 955
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 959
910=back 960=back
911 961
912=cut 962=cut
913 963
914############################################################################# 964#############################################################################
915# 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}
916 977
917sub reattach { 978sub reattach {
918 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 980 my ($obj) = @_;
920 981
967sub object_freezer_save { 1028sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
969 1030
970 sync_job { 1031 sync_job {
971 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
974 1036
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
997 } 1059 }
998 } else { 1060 } else {
999 aio_unlink $filename; 1061 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1001 } 1063 }
1002 } 1064 };
1003} 1065}
1004 1066
1005sub object_freezer_as_string { 1067sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1007 1069
1019 or return; 1081 or return;
1020 1082
1021 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1085 or return;
1086
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1025 } 1088 }
1026 1089
1090 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1029 return ($data, $av); 1094 ($data, $av)
1030} 1095}
1031 1096
1032=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1033 1098
1034=over 4 1099=over 4
1107 my ($pl, $buf) = @_; 1172 my ($pl, $buf) = @_;
1108 1173
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1174 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1175
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1184 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1185 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1186 }
1187
1188 $pl->ext_reply ($reply, @reply)
1189 if $reply;
1190
1117 } else { 1191 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1193 }
1120 1194
1121 cf::override; 1195 cf::override;
1211 1285
1212=head3 cf::player 1286=head3 cf::player
1213 1287
1214=over 4 1288=over 4
1215 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
1216=item cf::player::find $login 1304=item cf::player::find $login
1217 1305
1218Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1219 1307
1220=cut 1308=cut
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1347
1260 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1261 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;
1262 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1263 } 1356 }
1264 } 1357 }
1265} 1358}
1266 1359
1276 1369
1277 aio_mkdir playerdir $pl, 0770; 1370 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1371 $pl->{last_save} = $cf::RUNTIME;
1279 1372
1280 $pl->save_pl ($path); 1373 $pl->save_pl ($path);
1281 Coro::cede; 1374 cf::cede_to_tick;
1282} 1375}
1283 1376
1284sub new($) { 1377sub new($) {
1285 my ($login) = @_; 1378 my ($login) = @_;
1286 1379
1290 $self->{deny_save} = 1; 1383 $self->{deny_save} = 1;
1291 1384
1292 $cf::PLAYER{$login} = $self; 1385 $cf::PLAYER{$login} = $self;
1293 1386
1294 $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 (@_);
1295} 1398}
1296 1399
1297=item $pl->quit_character 1400=item $pl->quit_character
1298 1401
1299Nukes the player without looking back. If logged in, the connection will 1402Nukes the player without looking back. If logged in, the connection will
1354 or return []; 1457 or return [];
1355 1458
1356 my @logins; 1459 my @logins;
1357 1460
1358 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") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1362 1470
1363 utf8::decode $login; 1471 utf8::decode $login;
1364 push @logins, $login; 1472 push @logins, $login;
1365 } 1473 }
1366 1474
1404sub expand_cfpod { 1512sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1406 1514
1407 # escape & and < 1515 # escape & and <
1408 s/&/&amp;/g; 1516 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1410 1518
1411 # 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
1412 1520
1413 1 while 1521 1 while
1414 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418 # replace G<male|female> tags 1527 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1421 }ge 1530 }ge
1422 # replace H<hint text> 1531 # replace H<hint text>
1443sub hintmode { 1552sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1554 $_[0]{hintmode}
1446} 1555}
1447 1556
1448=item $player->ext_reply ($msgid, %msg) 1557=item $player->ext_reply ($msgid, @msg)
1449 1558
1450Sends an ext reply to the player. 1559Sends an ext reply to the player.
1451 1560
1452=cut 1561=cut
1453 1562
1454sub ext_reply($$%) { 1563sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1564 my ($self, $id, @msg) = @_;
1456 1565
1457 $msg{msgid} = $id; 1566 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1567}
1460 1568
1461=item $player->ext_event ($type, %msg) 1569=item $player->ext_msg ($type, @msg)
1462 1570
1463Sends an ext event to the client. 1571Sends an ext event to the client.
1464 1572
1465=cut 1573=cut
1466 1574
1467sub ext_event($$%) { 1575sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1576 my ($self, $type, @msg) = @_;
1469 1577
1470 $self->ns->ext_event ($type, %msg); 1578 $self->ns->ext_msg ($type, @msg);
1471} 1579}
1472 1580
1473=head3 cf::region 1581=head3 cf::region
1474 1582
1475=over 4 1583=over 4
1488 my ($path) = @_; 1596 my ($path) = @_;
1489 1597
1490 my ($match, $specificity); 1598 my ($match, $specificity);
1491 1599
1492 for my $region (list) { 1600 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1601 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1602 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1603 if $region->specificity > $specificity;
1496 } 1604 }
1497 } 1605 }
1498 1606
1618 $self->init; # pass $1 etc. 1726 $self->init; # pass $1 etc.
1619 return $self; 1727 return $self;
1620 } 1728 }
1621 } 1729 }
1622 1730
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1731 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1732 ()
1625} 1733}
1626 1734
1627sub init { 1735sub init {
1628 my ($self) = @_; 1736 my ($self) = @_;
1691 1799
1692sub load_header_from($) { 1800sub load_header_from($) {
1693 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1694 1802
1695 utf8::encode $path; 1803 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 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;
1701 1812
1702 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1703 1814
1704 1 1815 1
1705} 1816}
1759sub find { 1870sub find {
1760 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1761 1872
1762 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1763 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1765 1877
1766 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1767 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
1768 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1769 or return; 1883 or return;
1770 1884
1771 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1772 1886
1774 or return; 1888 or return;
1775 1889
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1779 $map->reset; 1895 $map->reset;
1780 undef $guard;
1781 return find $path; 1896 return find $path;
1782 } 1897 }
1783 1898
1784 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1785 } 1900 }
1794 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1795 1910
1796 my $path = $self->{path}; 1911 my $path = $self->{path};
1797 1912
1798 { 1913 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1800 1915
1916 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1802 1918
1803 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1804 1920
1805 $self->alloc; 1921 $self->alloc;
1806 1922
1807 $self->pre_load; 1923 $self->pre_load;
1808 Coro::cede; 1924 cf::cede_to_tick;
1809 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1811 or return; 1929 or return;
1812 1930
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1815 1933
1816 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 1935 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 1938 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1821 } 1942 }
1822 } 1943 }
1823 1944
1824 Coro::cede; 1945 $f->resolve_delayed_derefs;
1946
1947 cf::cede_to_tick;
1825 # now do the right thing for maps 1948 # now do the right thing for maps
1826 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 1951 unless $self->difficulty;
1829 Coro::cede; 1952 cf::cede_to_tick;
1830 1953
1831 unless ($self->{deny_activate}) { 1954 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 1955 $self->decay_objects;
1833 $self->fix_auto_apply; 1956 $self->fix_auto_apply;
1834 $self->update_buttons; 1957 $self->update_buttons;
1835 Coro::cede; 1958 cf::cede_to_tick;
1836 $self->set_darkness_map; 1959 $self->set_darkness_map;
1837 Coro::cede; 1960 cf::cede_to_tick;
1838 $self->activate; 1961 $self->activate;
1839 } 1962 }
1963
1964 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME);
1840 1966
1841 $self->in_memory (cf::MAP_IN_MEMORY); 1967 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 1968 }
1843 1969
1844 $self->post_load; 1970 $self->post_load;
1855 1981
1856 $self 1982 $self
1857} 1983}
1858 1984
1859# 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
1860sub load_diag { 1986sub load_neighbours {
1861 my ($map) = @_; 1987 my ($map) = @_;
1862 1988
1863 my @diag; # diagonal neighbours 1989 my @neigh; # diagonal neighbours
1864 1990
1865 for (0 .. 3) { 1991 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 1992 my $neigh = $map->tile_path ($_)
1867 or next; 1993 or next;
1868 $neigh = find $neigh, $map 1994 $neigh = find $neigh, $map
1869 or next; 1995 or next;
1870 $neigh->load; 1996 $neigh->load;
1871 1997
1998 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1999 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2000 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 2001 }
1875 2002
1876 for (@diag) { 2003 for (grep defined $_->[0], @neigh) {
2004 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 2005 my $neigh = find $path, $origin
1878 or next; 2006 or next;
1879 $neigh->load; 2007 $neigh->load;
1880 } 2008 }
1881} 2009}
1882 2010
1887} 2015}
1888 2016
1889sub do_load_sync { 2017sub do_load_sync {
1890 my ($map) = @_; 2018 my ($map) = @_;
1891 2019
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main;
2022
1892 cf::sync_job { $map->load }; 2023 cf::sync_job { $map->load };
1893} 2024}
1894 2025
1895our %MAP_PREFETCH; 2026our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2027our $MAP_PREFETCHER = undef;
1897 2028
1898sub find_async { 2029sub find_async {
1899 my ($path, $origin) = @_; 2030 my ($path, $origin, $load) = @_;
1900 2031
1901 $path = normalise $path, $origin && $origin->{path}; 2032 $path = normalise $path, $origin && $origin->{path};
1902 2033
1903 if (my $map = $cf::MAP{$path}) { 2034 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 2036 }
1906 2037
1907 undef $MAP_PREFETCH{$path}; 2038 $MAP_PREFETCH{$path} |= $load;
2039
1908 $MAP_PREFETCHER ||= cf::async { 2040 $MAP_PREFETCHER ||= cf::async {
1909 while (%MAP_PREFETCH) { 2041 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2042 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2043 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2044 $map->load if $v;
2045 }
1914 2046
1915 delete $MAP_PREFETCH{$path}; 2047 delete $MAP_PREFETCH{$k};
1916 } 2048 }
1917 } 2049 }
1918 undef $MAP_PREFETCHER; 2050 undef $MAP_PREFETCHER;
1919 }; 2051 };
1920 $MAP_PREFETCHER->prio (6); 2052 $MAP_PREFETCHER->prio (6);
1923} 2055}
1924 2056
1925sub save { 2057sub save {
1926 my ($self) = @_; 2058 my ($self) = @_;
1927 2059
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2061
1930 $self->{last_save} = $cf::RUNTIME; 2062 $self->{last_save} = $cf::RUNTIME;
1931 2063
1932 return unless $self->dirty; 2064 return unless $self->dirty;
1933 2065
1956 my ($self) = @_; 2088 my ($self) = @_;
1957 2089
1958 # save first because save cedes 2090 # save first because save cedes
1959 $self->save; 2091 $self->save;
1960 2092
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2094
1963 return if $self->players; 2095 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2097 return if $self->{deny_save};
1966 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2103 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2104}
1970 2105
1971sub reset_at { 2106sub reset_at {
1972 my ($self) = @_; 2107 my ($self) = @_;
1973 2108
2005 if $uniq; 2140 if $uniq;
2006 } 2141 }
2007 2142
2008 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2009 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2147 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2148
2014 $self->unlink_save; 2149 $self->unlink_save;
2015 $self->destroy; 2150 $self->destroy;
2016} 2151}
2017 2152
2018my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2019 2154
2020sub nuke { 2155sub nuke {
2021 my ($self) = @_; 2156 my ($self) = @_;
2022 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2023 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2024 2162
2025 $self->unlink_save; 2163 $self->unlink_save;
2026 2164
2027 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2170
2033 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2034 2173
2035 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2036} 2175}
2037 2176
2038=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
2114 2253
2115sub inv_recursive { 2254sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2117} 2256}
2118 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
2119package cf; 2289package cf;
2120 2290
2121=back 2291=back
2122 2292
2123=head3 cf::object::player 2293=head3 cf::object::player
2145 2315
2146 } else { 2316 } else {
2147 my $pl = $self->contr; 2317 my $pl = $self->contr;
2148 2318
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2319 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2320 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2322
2158 } else { 2323 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2324 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2325 $self->message ($msg, $flags);
2161 } 2326 }
2162 } 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 (@_);
2163} 2338}
2164 2339
2165=item $player_object->may ("access") 2340=item $player_object->may ("access")
2166 2341
2167Returns wether the given player is authorized to access resource "access" 2342Returns wether the given player is authorized to access resource "access"
2246 # use -1 or undef as default coordinates, not 0, 0 2421 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2422 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2423 if $x <=0 && $y <= 0;
2249 2424
2250 $map->load; 2425 $map->load;
2251 $map->load_diag; 2426 $map->load_neighbours;
2252 2427
2253 return unless $self->contr->active; 2428 return unless $self->contr->active;
2254 $self->activate_recursive; 2429 $self->activate_recursive;
2255 2430
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2432 $self->enter_map ($map, $x, $y);
2258} 2433}
2259 2434
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2436
2262Moves 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
2263her, loading and preparing them map, calling the provided $check callback 2438her, loading and preparing them map, calling the provided $check callback
2264that 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
2265the 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.
2266 2442
2267=cut 2443=cut
2268 2444
2269our $GOTOGEN; 2445our $GOTOGEN;
2270 2446
2271sub cf::object::player::goto { 2447sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2448 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2449
2274 # 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
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2452
2277 $self->enter_link; 2453 $self->enter_link;
2278 2454
2279 (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
2280 my $map = eval { 2475 my $map = eval {
2281 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2282 2477
2283 if ($map) { 2478 if ($map) {
2284 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2286 } else { 2481 } else {
2287 $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);
2288 } 2483 }
2289 2484
2290 $map 2485 $map
2291 }; 2486 };
2292 2487
2297 2492
2298 if ($gen == $self->{_goto_generation}) { 2493 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2494 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2495 $self->leave_link ($map, $x, $y);
2301 } 2496 }
2497
2498 $done->() if $done;
2302 })->prio (1); 2499 })->prio (1);
2303} 2500}
2304 2501
2305=item $player_object->enter_exit ($exit_object) 2502=item $player_object->enter_exit ($exit_object)
2306 2503
2415 2612
2416 utf8::encode $text; 2613 utf8::encode $text;
2417 $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);
2418} 2615}
2419 2616
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2617=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2618
2422Send 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
2423client 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
2424the 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
2425the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2426 2623
2427=cut 2624=cut
2428 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
2429sub cf::client::send_msg { 2641sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2643
2432 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2433 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
2434 return unless @extra || length $msg; 2662 return unless @extra || length $msg;
2435 2663
2436 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
2437 $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]));
2438 } else { 2671 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 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
2450 if (0 && $msg =~ /\[/) { 2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2690 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2692 $self->send_packet ("drawinfo $color $msg")
2455 } 2693 }
2456 } 2694 }
2457 } 2695 }
2458} 2696}
2459 2697
2460=item $client->ext_event ($type, %msg) 2698=item $client->ext_msg ($type, @msg)
2461 2699
2462Sends an ext event to the client. 2700Sends an ext event to the client.
2463 2701
2464=cut 2702=cut
2465 2703
2466sub cf::client::ext_event($$%) { 2704sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2705 my ($self, $type, @msg) = @_;
2468 2706
2707 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2710 push @msg, msgtype => "event_$type";
2470 $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 }
2471} 2731}
2472 2732
2473=item $success = $client->query ($flags, "text", \&cb) 2733=item $success = $client->query ($flags, "text", \&cb)
2474 2734
2475Queues a query to the client, calling the given callback with 2735Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 2790 my ($ns, $buf) = @_;
2531 2791
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2792 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2793
2534 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
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2802 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2803 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2804 }
2805
2806 $ns->ext_reply ($reply, @reply)
2807 if $reply;
2808
2541 } else { 2809 } else {
2542 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";
2543 } 2811 }
2544 2812
2545 cf::override; 2813 cf::override;
2592our $safe = new Safe "safe"; 2860our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 2861our $safe_hole = new Safe::Hole;
2594 2862
2595$SIG{FPE} = 'IGNORE'; 2863$SIG{FPE} = 'IGNORE';
2596 2864
2597$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));
2598 2870
2599# here we export the classes and methods available to script code 2871# here we export the classes and methods available to script code
2600 2872
2601=pod 2873=pod
2602 2874
2603The following functions and methods are available within a safe environment: 2875The following functions and methods are available within a safe environment:
2604 2876
2605 cf::object 2877 cf::object
2606 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
2607 insert remove 2879 insert remove name archname title slaying race decrease_ob_nr
2608 2880
2609 cf::object::player 2881 cf::object::player
2610 player 2882 player
2611 2883
2612 cf::player 2884 cf::player
2617 2889
2618=cut 2890=cut
2619 2891
2620for ( 2892for (
2621 ["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
2622 insert remove)], 2895 decrease_ob_nr)],
2623 ["cf::object::player" => qw(player)], 2896 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 2897 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 2898 ["cf::map" => qw(trigger)],
2626) { 2899) {
2627 no strict 'refs'; 2900 no strict 'refs';
2703# the server's init and main functions 2976# the server's init and main functions
2704 2977
2705sub load_facedata($) { 2978sub load_facedata($) {
2706 my ($path) = @_; 2979 my ($path) = @_;
2707 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
2708 warn "loading facedata from $path\n"; 2987 warn "loading facedata from $path\n";
2709 2988
2710 my $facedata; 2989 my $facedata;
2711 0 < aio_load $path, $facedata 2990 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 2991 or die "$path: $!";
2714 $facedata = Coro::Storable::thaw $facedata; 2993 $facedata = Coro::Storable::thaw $facedata;
2715 2994
2716 $facedata->{version} == 2 2995 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 2996 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 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
2719 { 3005 {
2720 my $faces = $facedata->{faceinfo}; 3006 my $faces = $facedata->{faceinfo};
2721 3007
2722 while (my ($face, $info) = each %$faces) { 3008 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3009 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3010 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 3014
3015 cf::cede_to_tick;
2728 } 3016 }
2729 3017
2730 while (my ($face, $info) = each %$faces) { 3018 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3019 next unless $info->{smooth};
2732 my $idx = cf::face::find $face 3020 my $idx = cf::face::find $face
2733 or next; 3021 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3022 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3025 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3026 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3027 }
2739 Coro::cede; 3028
3029 cf::cede_to_tick;
2740 } 3030 }
2741 } 3031 }
2742 3032
2743 { 3033 {
2744 my $anims = $facedata->{animinfo}; 3034 my $anims = $facedata->{animinfo};
2745 3035
2746 while (my ($anim, $info) = each %$anims) { 3036 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3037 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3038 cf::cede_to_tick;
2749 } 3039 }
2750 3040
2751 cf::anim::invalidate_all; # d'oh 3041 cf::anim::invalidate_all; # d'oh
2752 } 3042 }
2753 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
2754 1 3093 1
2755} 3094}
2756 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
2757sub 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
2758 load_resource_file "$MAPDIR/regions" 3109 load_resource_file "$MAPDIR/regions"
2759 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 }
2760} 3116}
2761 3117
2762sub reload_facedata { 3118sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3119 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3120 or die "unable to load facedata\n";
2793 3149
2794sub init { 3150sub init {
2795 reload_resources; 3151 reload_resources;
2796} 3152}
2797 3153
2798sub cfg_load { 3154sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3155 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3156 or return;
2801 3157
2802 local $/; 3158 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3159 *CFG = YAML::Syck::Load <$fh>;
2823 (async { 3179 (async {
2824 Event::one_event; 3180 Event::one_event;
2825 })->prio (Coro::PRIO_MAX); 3181 })->prio (Coro::PRIO_MAX);
2826 }; 3182 };
2827 3183
2828 cfg_load; 3184 reload_config;
2829 db_init; 3185 db_init;
2830 load_extensions; 3186 load_extensions;
2831 3187
2832 $TICK_WATCHER->start; 3188 $TICK_WATCHER->start;
2833 Event::loop; 3189 Event::loop;
3026 warn "reloading cf.pm"; 3382 warn "reloading cf.pm";
3027 require cf; 3383 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3385
3030 warn "loading config and database again"; 3386 warn "loading config and database again";
3031 cf::cfg_load; 3387 cf::reload_config;
3032 3388
3033 warn "loading extensions"; 3389 warn "loading extensions";
3034 cf::load_extensions; 3390 cf::load_extensions;
3035 3391
3036 warn "reattaching attachments to objects/players"; 3392 warn "reattaching attachments to objects/players";
3101 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 3459 $signal->wait;
3104} 3460}
3105 3461
3106 my $min = 1e6;#d#
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3109 reentrant => 0, 3463 reentrant => 0,
3110 parked => 1, 3464 parked => 1,
3111 prio => 0, 3465 prio => 0,
3112 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
3120 3474
3121 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3122 3476
3123 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3124 3478
3125 0 && sync_job {#d#
3126 for(1..10) {
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130
3131 $map->width (50);
3132 $map->height (50);
3133 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1);
3135 my $t = Event::time - $t;
3136
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 };
3147
3148 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3150 3481
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3154 write_runtime 3485 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3156 }; 3487 };
3157 } 3488 }
3158 3489
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 3491 $sig->send;
3164 } 3492 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send; 3494 $sig->send;
3176 3504
3177 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 3507
3180 _post_tick; 3508 _post_tick;
3181
3182
3183 }, 3509 },
3184); 3510);
3185 3511
3186{ 3512{
3513 BDB::min_parallel 8;
3187 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3188 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3189 reentrant => 0, 3516 reentrant => 0,
3190 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3191 poll => 'r', 3518 poll => 'r',
3192 prio => 0, 3519 prio => 0,
3193 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3195 ); 3522 );
3196 BDB::min_parallel 8;
3197 3523
3198 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3199 my $status; 3525 my $status;
3200 my $current = $Coro::current; 3526 my $current = $Coro::current;
3201 ( 3527 (
3210 ) 3536 )
3211 }; 3537 };
3212 3538
3213 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3214 $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);
3215 3545
3216 cf::sync_job { 3546 cf::sync_job {
3217 eval { 3547 eval {
3218 BDB::db_env_open 3548 BDB::db_env_open
3219 $DB_ENV, 3549 $DB_ENV,
3221 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
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 3553 0666;
3224 3554
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 3556 };
3230 3557
3231 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 3559 };
3233 } 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 );
3234} 3592}
3235 3593
3236{ 3594{
3237 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3238 3596

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines