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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines