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.239 by root, Mon Apr 16 06:23:42 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Socket;
9use Event; 9use Event;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13use Storable ();
13 14
14use Coro 3.52 (); 15use Coro 4.1 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::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
… …
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 63
59our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 80our $NEXT_TICK;
64our $NOW; 81our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
66 83
67our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
68our $DB_ENV; 88our $DB_ENV;
69 89
70our %CFG; 90our %CFG;
71 91
72our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
73our $RUNTIME; 93our $RUNTIME;
74 94
75our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
76our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
77our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 98
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
105
84binmode STDOUT; 106binmode STDOUT;
85binmode STDERR; 107binmode STDERR;
86 108
87# read virtual server time, if available 109# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 110unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 111 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 112 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 113 $RUNTIME = <$fh> + 0.;
92} 114}
93 115
94mkdir cf::localdir; 116mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 118
101our $EMERGENCY_POSITION; 119our $EMERGENCY_POSITION;
102 120
103sub cf::map::normalise; 121sub cf::map::normalise;
104 122
… …
115=item $cf::RUNTIME 133=item $cf::RUNTIME
116 134
117The time this server has run, starts at 0 and is increased by $cf::TICK on 135The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 136every server tick.
119 137
120=item $cf::LIBDIR 138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 141
122The perl library directory, where extensions and cf-specific modules can 142Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 143directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and
145database environment.
124 146
125=item $cf::NOW 147=item $cf::NOW
126 148
127The time of the last (current) server tick. 149The time of the last (current) server tick.
128 150
129=item $cf::TICK 151=item $cf::TICK
130 152
131The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
132 154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
164
133=item %cf::CFG 165=item %cf::CFG
134 166
135Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
136from wherever your confdir points to. 168from wherever your confdir points to.
137 169
138=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
139 171
140These 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
141returns 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
142per 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.
143 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
144=back 182=back
145 183
146=cut 184=cut
147 185
148BEGIN { 186BEGIN {
149 *CORE::GLOBAL::warn = sub { 187 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 188 my $msg = join "", @_;
151 utf8::encode $msg;
152 189
153 $msg .= "\n" 190 $msg .= "\n"
154 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
192
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
155 194
156 LOG llevError, $msg; 195 LOG llevError, $msg;
157 }; 196 };
158} 197}
159 198
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
165@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
166 206
167# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
168# within the Safe compartment. 208# within the Safe compartment.
169for my $pkg (qw( 209for my $pkg (qw(
170 cf::global cf::attachable 210 cf::global cf::attachable
… …
178} 218}
179 219
180$Event::DIED = sub { 220$Event::DIED = sub {
181 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
182}; 222};
223
224#############################################################################
183 225
184=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
185 227
186=over 4 228=over 4
187 229
… …
206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
207 $d 249 $d
208 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
209} 251}
210 252
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
214 254
215Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
216 256
217=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
218 258
219Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
220 267
221=item cf::lock_wait $string 268=item cf::lock_wait $string
222 269
223Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
224 271
… …
227Wait 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
228a 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,
229for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
230returned. 277returned.
231 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
232Lock 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
233uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
234 284
285=item $locked = cf::lock_active $string
286
287Return true if the lock is currently active, i.e. somebody has locked it.
288
235=cut 289=cut
236 290
237our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
238 293
239sub lock_wait($) { 294sub lock_wait($) {
240 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#
241 301
242 # wait for lock, if any 302 # wait for lock, if any
243 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
244 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
245 Coro::schedule; 305 Coro::schedule;
… …
251 311
252 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
253 lock_wait $key; 313 lock_wait $key;
254 314
255 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
256 317
257 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
258 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
260 } 322 }
323}
324
325sub lock_active($) {
326 my ($key) = @_;
327
328 ! ! $LOCK{$key}
261} 329}
262 330
263sub freeze_mainloop { 331sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 332 return unless $TICK_WATCHER->is_active;
265 333
… …
268 }; 336 };
269 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
270 $guard 338 $guard
271} 339}
272 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
273=item cf::async { BLOCK } 399=item cf::async { BLOCK }
274 400
275Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
276C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
277thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
… …
280 406
281BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
282 408
283=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
284 410
285The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Deliantra requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Deliantra is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
288 415
289If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
292fast or be very important. 419fast or be very important.
… …
295 422
296sub sync_job(&) { 423sub sync_job(&) {
297 my ($job) = @_; 424 my ($job) = @_;
298 425
299 if ($Coro::current == $Coro::main) { 426 if ($Coro::current == $Coro::main) {
427 my $time = Event::time;
428
300 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
302 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
303 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 435 # (but this is cancel-safe)
305 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
306 437
307 my $busy = 1; 438 my $busy = 1;
308 my @res; 439 my @res;
309 440
310 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
311 @res = eval { $job->() }; 443 @res = eval { $job->() };
312 warn $@ if $@; 444 warn $@ if $@;
313 undef $busy; 445 undef $busy;
314 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
315 447
316 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
317 Coro::cede or Event::one_event; 452 Event::one_event;
318 } 453 }
454 }
455
456 $time = Event::time - $time;
457
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load
319 462
320 wantarray ? @res : $res[0] 463 wantarray ? @res : $res[0]
321 } else { 464 } else {
322 # we are in another coroutine, how wonderful, everything just works 465 # we are in another coroutine, how wonderful, everything just works
323 466
… …
343 $EXT_CORO{$coro+0} = $coro; 486 $EXT_CORO{$coro+0} = $coro;
344 487
345 $coro 488 $coro
346} 489}
347 490
348sub write_runtime { 491=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 492
351 my $runtime = cf::localdir . "/runtime"; 493Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling.
352 497
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 498=cut
354 or return;
355 499
356 my $value = $cf::RUNTIME + 90 + 10; 500sub fork_call(&@) {
357 # 10 is the runtime save interval, for a monotonic clock 501 my ($cb, @args) = @_;
358 # 60 allows for the watchdog to kill the server.
359 502
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 503 # we seemingly have to make a local copy of the whole thing,
361 and return; 504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
362 506
363 # always fsync - this file is important 507 my @res = Coro::Util::fork_eval {
364 aio_fsync $fh 508 reset_signals;
365 and return; 509 &$cb
510 }, @args;
366 511
367 close $fh 512 wantarray ? @res : $res[-1]
368 or return; 513}
369 514
370 aio_rename "$runtime~", $runtime 515=item $value = cf::db_get $family => $key
371 and return;
372 516
517Returns a single value from the environment database.
518
519=item cf::db_put $family => $key => $value
520
521Stores the given C<$value> in the family. It can currently store binary
522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
547
548our $DB;
549
550sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db";
553 };
554}
555
556sub db_get($$) {
557 my $key = "$_[0]/$_[1]";
558
559 cf::sync_job {
560 BDB::db_get $DB, undef, $key, my $data;
561
562 $! ? ()
563 : $data
373 1 564 }
565}
566
567sub db_put($$$) {
568 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
570}
571
572=item cf::cache $id => [$paths...], $processversion => $process
573
574Generic caching function that returns the value of the resource $id,
575caching and regenerating as required.
576
577This function can block.
578
579=cut
580
581sub cache {
582 my ($id, $src, $processversion, $process) = @_;
583
584 my $meta =
585 join "\x00",
586 $processversion,
587 map {
588 aio_stat $_
589 and Carp::croak "$_: $!";
590
591 ($_, (stat _)[7,9])
592 } @$src;
593
594 my $dbmeta = db_get cache => "$id/meta";
595 if ($dbmeta ne $meta) {
596 # changed, we may need to process
597
598 my @data;
599 my $md5;
600
601 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_]
603 or Carp::croak "$src->[$_]: $!";
604 }
605
606 # if processing is expensive, check
607 # checksum first
608 if (1) {
609 $md5 =
610 join "\x00",
611 $processversion,
612 map {
613 cf::cede_to_tick;
614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
615 } 0.. $#$src;
616
617
618 my $dbmd5 = db_get cache => "$id/md5";
619 if ($dbmd5 eq $md5) {
620 db_put cache => "$id/meta", $meta;
621
622 return db_get cache => "$id/data";
623 }
624 }
625
626 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time;
629
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
631
632 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta;
635
636 return $data;
637 }
638
639 db_get cache => "$id/data"
374} 640}
375 641
376=item cf::datalog type => key => value, ... 642=item cf::datalog type => key => value, ...
377 643
378Log a datalog packet of the given type with the given key-value pairs. 644Log a datalog packet of the given type with the given key-value pairs.
… …
396attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
398 664
399In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
400C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 667Deliantra).
402 668
403=over 4 669=over 4
404 670
405=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
406 672
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 835 $registry = $CB_TYPE[$object_type] ||= [];
570 836
571 } elsif ($type eq "subtype") { 837 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 838 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 839 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 840 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 841
576 } elsif ($type eq "package") { 842 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 843 my $pkg = shift @arg;
578 844
579 while (my ($name, $id) = each %cb_id) { 845 while (my ($name, $id) = each %cb_id) {
… …
608 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
609 } 875 }
610 876
611 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
612 } else { 878 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 880 }
615 881
616 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
617} 883}
618 884
… …
620 if (ref $_[0]) { 886 if (ref $_[0]) {
621 _object_attach @_; 887 _object_attach @_;
622 } else { 888 } else {
623 _attach shift->_attach_registry, @_; 889 _attach shift->_attach_registry, @_;
624 } 890 }
891 _recalc_want;
625}; 892};
626 893
627# all those should be optimised 894# all those should be optimised
628sub cf::attachable::detach { 895sub cf::attachable::detach {
629 my ($obj, $name) = @_; 896 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 899 delete $obj->{_attachment}{$name};
633 reattach ($obj); 900 reattach ($obj);
634 } else { 901 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 902 Carp::croak "cannot, currently, detach class attachments";
636 } 903 }
904 _recalc_want;
637}; 905};
638 906
639sub cf::attachable::attached { 907sub cf::attachable::attached {
640 my ($obj, $name) = @_; 908 my ($obj, $name) = @_;
641 909
… …
656 "; 924 ";
657 die if $@; 925 die if $@;
658} 926}
659 927
660our $override; 928our $override;
661our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
662 930
663sub override { 931sub override {
664 $override = 1; 932 $override = 1;
665 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
666} 934}
667 935
668sub do_invoke { 936sub do_invoke {
669 my $event = shift; 937 my $event = shift;
670 my $callbacks = shift; 938 my $callbacks = shift;
671 939
672 @invoke_results = (); 940 @INVOKE_RESULTS = ();
673 941
674 local $override; 942 local $override;
675 943
676 for (@$callbacks) { 944 for (@$callbacks) {
677 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
… …
694 962
695Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
696 964
697This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
698removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
699results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 968
701=back 969=back
702 970
703=cut 971=cut
704 972
705############################################################################# 973#############################################################################
706# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
707 1017
708sub reattach { 1018sub reattach {
709 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 1020 my ($obj) = @_;
711 1021
… …
758sub object_freezer_save { 1068sub object_freezer_save {
759 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
760 1070
761 sync_job { 1071 sync_job {
762 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
763 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
764 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
765 1076
766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
767 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
768 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
769 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
770 close $fh; 1081 close $fh;
771 1082
772 if (@$objs) { 1083 if (@$objs) {
773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
774 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
775 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
776 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
777 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
778 close $fh; 1089 close $fh;
779 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
780 } 1091 }
… …
788 } 1099 }
789 } else { 1100 } else {
790 aio_unlink $filename; 1101 aio_unlink $filename;
791 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
792 } 1103 }
793 } 1104 };
794} 1105}
795 1106
796sub object_freezer_as_string { 1107sub object_freezer_as_string {
797 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
798 1109
… …
810 or return; 1121 or return;
811 1122
812 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
813 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
814 or return; 1125 or return;
1126
815 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
816 } 1129 }
817 1130
1131 utf8::decode (my $decname = $filename);
818 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1133 $decname, length $data, scalar @{$av || []};
1134
820 return ($data, $av); 1135 ($data, $av)
821} 1136}
1137
1138=head2 COMMAND CALLBACKS
1139
1140=over 4
1141
1142=cut
822 1143
823############################################################################# 1144#############################################################################
824# command handling &c 1145# command handling &c
825 1146
826=item cf::register_command $name => \&callback($ob,$args); 1147=item cf::register_command $name => \&callback($ob,$args);
… …
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1161}
841 1162
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1164
844Register a callbackf ro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
845 1170
846If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
847called. 1172called.
848 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
849=cut 1185=cut
850 1186
851sub register_extcmd { 1187sub register_extcmd {
852 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
853 1189
854 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
855} 1197}
856 1198
857cf::player->attach ( 1199cf::player->attach (
858 on_command => sub { 1200 on_command => sub {
859 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
… …
868 cf::override; 1210 cf::override;
869 }, 1211 },
870 on_extcmd => sub { 1212 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
872 1214
873 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1216
875 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
877 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
878 $pl->ext_reply ($msg->{msgid}, %reply);
879 }
880 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
881 } else { 1232 } else {
882 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
883 } 1234 }
884 1235
885 cf::override; 1236 cf::override;
886 }, 1237 },
887); 1238);
888 1239
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1240sub load_extensions {
1241 cf::sync_job {
1242 my %todo;
1243
924 for my $ext (<$LIBDIR/*.ext>) { 1244 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1245 next unless -r $path;
926 eval { 1246
927 load_extension $ext; 1247 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1248 my $base = $1;
1249 my $pkg = $1;
1250 $pkg =~ s/[^[:word:]]/_/g;
1251 $pkg = "ext::$pkg";
1252
1253 open my $fh, "<:utf8", $path
1254 or die "$path: $!";
1255
1256 my $source = do { local $/; <$fh> };
1257
1258 my %ext = (
1259 path => $path,
1260 base => $base,
1261 pkg => $pkg,
1262 );
1263
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266
1267 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n"
1270 . $source
1271 . "\n};\n1";
1272
1273 $todo{$base} = \%ext;
1274 }
1275
1276 my %done;
1277 while (%todo) {
1278 my $progress;
1279
1280 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip
1283 unless exists $done{$_};
1284 }
1285
1286 warn "... loading '$k' into '$v->{pkg}'\n";
1287
1288 unless (eval $v->{source}) {
1289 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n";
1291
1292 if (exists $v->{meta}{mandatory}) {
1293 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n";
1295 exit 1;
1296 }
1297
1298 warn $msg;
1299 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
928 1 1304 }
929 } or warn "$ext not loaded: $@"; 1305
1306 skip:
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1308 unless $progress;
1309 }
930 } 1310 };
931} 1311}
932 1312
933############################################################################# 1313#############################################################################
934 1314
1315=back
1316
935=head2 CORE EXTENSIONS 1317=head2 CORE EXTENSIONS
936 1318
937Functions and methods that extend core crossfire objects. 1319Functions and methods that extend core crossfire objects.
938 1320
939=cut 1321=cut
… …
944 1326
945=head3 cf::player 1327=head3 cf::player
946 1328
947=over 4 1329=over 4
948 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
949=item cf::player::find $login 1345=item cf::player::find $login
950 1346
951Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
952 1348
953=cut 1349=cut
954 1350
955sub playerdir($) { 1351sub playerdir($) {
956 cf::localdir 1352 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1353 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1354}
962 1355
963sub path($) { 1356sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1357 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
995 1388
996 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
997 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
998 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
999 } 1397 }
1000 } 1398 }
1001} 1399}
1002 1400
… …
1012 1410
1013 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1014 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1015 1413
1016 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1017 Coro::cede; 1415 cf::cede_to_tick;
1018} 1416}
1019 1417
1020sub new($) { 1418sub new($) {
1021 my ($login) = @_; 1419 my ($login) = @_;
1022 1420
… …
1026 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1027 1425
1028 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1029 1427
1030 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1031} 1439}
1032 1440
1033=item $pl->quit_character 1441=item $pl->quit_character
1034 1442
1035Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
… …
1084while and may block, so not sync_job-capable, ever. 1492while and may block, so not sync_job-capable, ever.
1085 1493
1086=cut 1494=cut
1087 1495
1088sub list_logins { 1496sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1497 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1498 or return [];
1091 1499
1092 my @logins; 1500 my @logins;
1093 1501
1094 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1095 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1096 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1097 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1098 1511
1099 utf8::decode $login; 1512 utf8::decode $login;
1100 push @logins, $login; 1513 push @logins, $login;
1101 } 1514 }
1102 1515
… …
1129 } 1542 }
1130 1543
1131 \@paths 1544 \@paths
1132} 1545}
1133 1546
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548
1549Expand crossfire pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639
1134=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1135 1641
1136Sends an ext reply to the player. 1642Sends an ext reply to the player.
1137 1643
1138=cut 1644=cut
1139 1645
1140sub ext_reply($$%) { 1646sub ext_reply($$@) {
1141 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1142 1648
1143 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1144
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1650}
1147 1651
1148=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1149 1653
1150Sends an ext event to the client. 1654Sends an ext event to the client.
1151 1655
1152=cut 1656=cut
1153 1657
1154sub ext_event($$%) { 1658sub ext_msg($$@) {
1155 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1156 1660
1157 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1158} 1662}
1159 1663
1160=head3 cf::region 1664=head3 cf::region
1161 1665
1162=over 4 1666=over 4
… …
1165 1669
1166package cf::region; 1670package cf::region;
1167 1671
1168=item cf::region::find_by_path $path 1672=item cf::region::find_by_path $path
1169 1673
1170Tries to decuce the probable region for a map knowing only its path. 1674Tries to decuce the likely region for a map knowing only its path.
1171 1675
1172=cut 1676=cut
1173 1677
1174sub find_by_path($) { 1678sub find_by_path($) {
1175 my ($path) = @_; 1679 my ($path) = @_;
1176 1680
1177 my ($match, $specificity); 1681 my ($match, $specificity);
1178 1682
1179 for my $region (list) { 1683 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) { 1684 if ($region->{match} && $path =~ $region->{match}) {
1181 ($match, $specificity) = ($region, $region->specificity) 1685 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity; 1686 if $region->specificity > $specificity;
1183 } 1687 }
1184 } 1688 }
1185 1689
… …
1249 my ($self, $merge) = @_; 1753 my ($self, $merge) = @_;
1250 1754
1251 # we have to keep some variables in memory intact 1755 # we have to keep some variables in memory intact
1252 local $self->{path}; 1756 local $self->{path};
1253 local $self->{load_path}; 1757 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1758
1257 $self->SUPER::thawer_merge ($merge); 1759 $self->SUPER::thawer_merge ($merge);
1258} 1760}
1259 1761
1260sub normalise { 1762sub normalise {
… …
1307 $self->init; # pass $1 etc. 1809 $self->init; # pass $1 etc.
1308 return $self; 1810 return $self;
1309 } 1811 }
1310 } 1812 }
1311 1813
1312 Carp::carp "unable to resolve path '$path' (base '$base')."; 1814 Carp::cluck "unable to resolve path '$path' (base '$base').";
1313 () 1815 ()
1314} 1816}
1315 1817
1316sub init { 1818sub init {
1317 my ($self) = @_; 1819 my ($self) = @_;
… …
1332 1834
1333# the original (read-only) location 1835# the original (read-only) location
1334sub load_path { 1836sub load_path {
1335 my ($self) = @_; 1837 my ($self) = @_;
1336 1838
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1839 "$MAPDIR/$self->{path}.map"
1338} 1840}
1339 1841
1340# the temporary/swap location 1842# the temporary/swap location
1341sub save_path { 1843sub save_path {
1342 my ($self) = @_; 1844 my ($self) = @_;
1343 1845
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1847 "$TMPDIR/$path.map"
1346} 1848}
1347 1849
1348# the unique path, undef == no special unique path 1850# the unique path, undef == no special unique path
1349sub uniq_path { 1851sub uniq_path {
1350 my ($self) = @_; 1852 my ($self) = @_;
1351 1853
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1855 "$UNIQUEDIR/$path"
1354} 1856}
1355 1857
1356# and all this just because we cannot iterate over 1858# and all this just because we cannot iterate over
1357# all maps in C++... 1859# all maps in C++...
1358sub change_all_map_light { 1860sub change_all_map_light {
… …
1360 1862
1361 $_->change_map_light ($change) 1863 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1864 for grep $_->outdoor, values %cf::MAP;
1363} 1865}
1364 1866
1867sub decay_objects {
1868 my ($self) = @_;
1869
1870 return if $self->{deny_reset};
1871
1872 $self->do_decay_objects;
1873}
1874
1365sub unlink_save { 1875sub unlink_save {
1366 my ($self) = @_; 1876 my ($self) = @_;
1367 1877
1368 utf8::encode (my $save = $self->save_path); 1878 utf8::encode (my $save = $self->save_path);
1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1879 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1372 1882
1373sub load_header_from($) { 1883sub load_header_from($) {
1374 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1375 1885
1376 utf8::encode $path; 1886 utf8::encode $path;
1377 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1378 # or return;
1379
1380 $self->_load_header ($path)
1381 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1382 1895
1383 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1384 1897
1385 1 1898 1
1386} 1899}
… …
1425 $self->load_header_orig 1938 $self->load_header_orig
1426 or return; 1939 or return;
1427 $self->prepare_orig; 1940 $self->prepare_orig;
1428 } 1941 }
1429 1942
1943 $self->{deny_reset} = 1
1944 if $self->no_reset;
1945
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1946 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1947 unless $self->default_region;
1432 1948
1433 1 1949 1
1434} 1950}
… …
1437sub find { 1953sub find {
1438 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1439 1955
1440 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1441 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1442 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1443 1960
1444 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1445 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1446 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1447 or return; 1966 or return;
1448 1967
1449 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1450 1969
1451 $map->load_header 1970 $map->load_header
1452 or return; 1971 or return;
1453 1972
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1457 $map->reset; 1978 $map->reset;
1458 undef $guard;
1459 return find $path; 1979 return find $path;
1460 } 1980 }
1461 1981
1462 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1463 } 1983 }
… …
1470 my ($self) = @_; 1990 my ($self) = @_;
1471 1991
1472 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1473 1993
1474 my $path = $self->{path}; 1994 my $path = $self->{path};
1995
1996 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1476 1998
1999 return unless $self->valid;
1477 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1478 2001
1479 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1480 2003
1481 $self->alloc; 2004 $self->alloc;
1482 2005
1483 $self->pre_load; 2006 $self->pre_load;
1484 Coro::cede; 2007 cf::cede_to_tick;
1485 2008
1486 $self->_load_objects ($self->{load_path}, 1) 2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
2011 $self->_load_objects ($f)
1487 or return; 2012 or return;
1488 2013
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1491 2016
1492 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq; 2018 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1495 $self->clear_unique_items; 2021 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1497 } 2025 }
1498 } 2026 }
1499 2027
1500 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1501 # now do the right thing for maps 2031 # now do the right thing for maps
1502 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede;
1510 $self->set_darkness_map;
1511 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 2034 unless $self->difficulty;
1513 Coro::cede; 2035 cf::cede_to_tick;
2036
2037 unless ($self->{deny_activate}) {
2038 $self->decay_objects;
2039 $self->fix_auto_apply;
2040 $self->update_buttons;
2041 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
1514 $self->activate; 2044 $self->activate;
1515 Coro::cede; 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
2049
2050 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 2051 }
1517 2052
1518 $self->post_load; 2053 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 2054}
1523 2055
1524sub customise_for { 2056sub customise_for {
1525 my ($self, $ob) = @_; 2057 my ($self, $ob) = @_;
1526 2058
1527 return find "~" . $ob->name . "/" . $self->{path} 2059 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 2060 if $self->per_player;
1529 2061
2062# return find "?party/" . $ob->name . "/" . $self->{path}
2063# if $self->per_party;
2064
1530 $self 2065 $self
1531} 2066}
1532 2067
1533# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1534sub load_diag { 2069sub load_neighbours {
1535 my ($map) = @_; 2070 my ($map) = @_;
1536 2071
1537 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1538 2073
1539 for (0 .. 3) { 2074 for (0 .. 3) {
1540 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1541 or next; 2076 or next;
1542 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1543 or next; 2078 or next;
1544 $neigh->load; 2079 $neigh->load;
1545 2080
2081 push @neigh,
1546 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1547 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1548 } 2084 }
1549 2085
1550 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1551 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1552 or next; 2089 or next;
1553 $neigh->load; 2090 $neigh->load;
1554 } 2091 }
1555} 2092}
1556 2093
… …
1561} 2098}
1562 2099
1563sub do_load_sync { 2100sub do_load_sync {
1564 my ($map) = @_; 2101 my ($map) = @_;
1565 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1566 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1567} 2107}
1568 2108
1569our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1570our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1571 2111
1572sub find_async { 2112sub find_async {
1573 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1574 2114
1575 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1576 2116
1577 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1579 } 2119 }
1580 2120
1581 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1582 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1583 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1585 my $map = find $path 2128 if (my $map = find $k) {
1586 or next;
1587 $map->load; 2129 $map->load if $v;
2130 }
1588 2131
1589 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1590 } 2133 }
1591 } 2134 }
1592 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1593 }; 2136 };
1594 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
… …
1597} 2140}
1598 2141
1599sub save { 2142sub save {
1600 my ($self) = @_; 2143 my ($self) = @_;
1601 2144
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 2146
1604 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1605 2148
1606 return unless $self->dirty; 2149 return unless $self->dirty;
1607 2150
… …
1613 return if $self->{deny_save}; 2156 return if $self->{deny_save};
1614 2157
1615 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
1616 2159
1617 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
1618 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
1619 }; 2163 };
1620 2164
1621 if ($uniq) { 2165 if ($uniq) {
1622 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1630 my ($self) = @_; 2174 my ($self) = @_;
1631 2175
1632 # save first because save cedes 2176 # save first because save cedes
1633 $self->save; 2177 $self->save;
1634 2178
1635 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1636 2180
1637 return if $self->players; 2181 return if $self->players;
1638 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
1639 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1640 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1641 $self->clear; 2189 $self->clear;
1642 $self->in_memory (cf::MAP_SWAPPED);
1643} 2190}
1644 2191
1645sub reset_at { 2192sub reset_at {
1646 my ($self) = @_; 2193 my ($self) = @_;
1647 2194
1648 # TODO: safety, remove and allow resettable per-player maps 2195 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 2196 return 1e99 if $self->{deny_reset};
1651 2197
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 2200
… …
1665 my ($self) = @_; 2211 my ($self) = @_;
1666 2212
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 2214
1669 return if $self->players; 2215 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 2216
1672 warn "resetting map ", $self->path;#d# 2217 warn "resetting map ", $self->path;
1673 2218
1674 $self->in_memory (cf::MAP_SWAPPED); 2219 $self->in_memory (cf::MAP_SWAPPED);
1675 2220
1676 # need to save uniques path 2221 # need to save uniques path
1677 unless ($self->{deny_save}) { 2222 unless ($self->{deny_save}) {
… …
1681 if $uniq; 2226 if $uniq;
1682 } 2227 }
1683 2228
1684 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
1685 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1686 $self->clear; 2233 $self->clear;
1687
1688 $_->clear_links_to ($self) for values %cf::MAP;
1689 2234
1690 $self->unlink_save; 2235 $self->unlink_save;
1691 $self->destroy; 2236 $self->destroy;
1692} 2237}
1693 2238
1694my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
1695 2240
1696sub nuke { 2241sub nuke {
1697 my ($self) = @_; 2242 my ($self) = @_;
1698 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
1699 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
1700 2248
1701 $self->unlink_save; 2249 $self->unlink_save;
1702 2250
1703 bless $self, "cf::map"; 2251 bless $self, "cf::map";
1704 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
1705 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
1706 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
1707 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1708 2256
1709 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
1710 2259
1711 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2261}
2262
2263=item $maps = cf::map::tmp_maps
2264
2265Returns an arrayref with all map paths of currently instantiated and saved
2266maps. May block.
2267
2268=cut
2269
2270sub tmp_maps() {
2271 [
2272 map {
2273 utf8::decode $_;
2274 /\.map$/
2275 ? normalise $_
2276 : ()
2277 } @{ aio_readdir $TMPDIR or [] }
2278 ]
2279}
2280
2281=item $maps = cf::map::random_maps
2282
2283Returns an arrayref with all map paths of currently instantiated and saved
2284random maps. May block.
2285
2286=cut
2287
2288sub random_maps() {
2289 [
2290 map {
2291 utf8::decode $_;
2292 /\.map$/
2293 ? normalise "?random/$_"
2294 : ()
2295 } @{ aio_readdir $RANDOMDIR or [] }
2296 ]
1712} 2297}
1713 2298
1714=item cf::map::unique_maps 2299=item cf::map::unique_maps
1715 2300
1716Returns an arrayref of paths of all shared maps that have 2301Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2302instantiated unique items. May block.
1718 2303
1719=cut 2304=cut
1720 2305
1721sub unique_maps() { 2306sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2307 [
1723 or return; 2308 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2309 utf8::decode $_;
1729 next if /\.pst$/; 2310 /\.map$/
1730 next unless /^$PATH_SEP/o; 2311 ? normalise $_
1731 2312 : ()
1732 push @paths, cf::map::normalise $_; 2313 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2314 ]
1734
1735 \@paths
1736} 2315}
1737 2316
1738package cf; 2317package cf;
1739 2318
1740=back 2319=back
… …
1758 map { $_, inv_recursive_ $_->inv } @_ 2337 map { $_, inv_recursive_ $_->inv } @_
1759} 2338}
1760 2339
1761sub inv_recursive { 2340sub inv_recursive {
1762 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2342}
2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
1763} 2370}
1764 2371
1765package cf; 2372package cf;
1766 2373
1767=back 2374=back
… …
1786 2393
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2394 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2395
1789 if ($self->{record_replies}) { 2396 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2397 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2398
1791 } else { 2399 } else {
2400 my $pl = $self->contr;
2401
2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2403 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405
2406 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2409 }
1794 } 2410 }
2411}
2412
2413=item $object->send_msg ($channel, $msg, $color, [extra...])
2414
2415=cut
2416
2417sub cf::object::send_msg {
2418 my $pl = shift->contr
2419 or return;
2420 $pl->send_msg (@_);
1795} 2421}
1796 2422
1797=item $player_object->may ("access") 2423=item $player_object->may ("access")
1798 2424
1799Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
… …
1846 $self->deactivate_recursive; 2472 $self->deactivate_recursive;
1847 2473
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2474 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2475
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2476 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2477 if $self->map && $self->map->{path} ne "{link}";
1852 2478
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2479 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2480}
1855 2481
1856sub cf::object::player::leave_link { 2482sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2483 my ($self, $map, $x, $y) = @_;
2484
2485 return unless $self->contr->active;
1858 2486
1859 my $link_pos = delete $self->{_link_pos}; 2487 my $link_pos = delete $self->{_link_pos};
1860 2488
1861 unless ($map) { 2489 unless ($map) {
1862 # restore original map position 2490 # restore original map position
… …
1876 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
1877 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
1878 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
1879 2507
1880 $map->load; 2508 $map->load;
1881 $map->load_diag; 2509 $map->load_neighbours;
1882 2510
1883 return unless $self->contr->active; 2511 return unless $self->contr->active;
1884 $self->activate_recursive; 2512 $self->activate_recursive;
1885 2513
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2515 $self->enter_map ($map, $x, $y);
1888} 2516}
1889 2517
1890cf::player->attach ( 2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1891 on_logout => sub {
1892 my ($pl) = @_;
1893 2519
1894 # abort map switching before logout 2520Moves the player to the given map-path and coordinates by first freezing
1895 if ($pl->ob->{_link_pos}) { 2521her, loading and preparing them map, calling the provided $check callback
1896 cf::sync_job { 2522that has to return the map if sucecssful, and then unfreezes the player on
1897 $pl->ob->leave_link 2523the new (success) or old (failed) map position. In either case, $done will
1898 }; 2524be called at the end of this process.
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903 2525
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y)
1923
1924=cut 2526=cut
2527
2528our $GOTOGEN;
1925 2529
1926sub cf::object::player::goto { 2530sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2531 my ($self, $path, $x, $y, $check, $done) = @_;
2532
2533 # do generation counting so two concurrent goto's will be executed in-order
2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2535
1929 $self->enter_link; 2536 $self->enter_link;
1930 2537
1931 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
1932 my $map = eval { 2560 my $map = eval {
1933 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2562
2563 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2564 $map = $map->customise_for ($self);
2565 $map = $check->($map) if $check && $map;
2566 } else {
2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569
1935 $map 2570 $map
2571 };
2572
2573 if ($@) {
2574 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2575 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2576 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2577
2578 if ($gen == $self->{_goto_generation}) {
2579 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2580 $self->leave_link ($map, $x, $y);
2581 }
2582
2583 $done->() if $done;
1940 })->prio (1); 2584 })->prio (1);
1941} 2585}
1942 2586
1943=item $player_object->enter_exit ($exit_object) 2587=item $player_object->enter_exit ($exit_object)
1944 2588
… …
1983 2627
1984 $rmp->{random_seed} ||= $exit->random_seed; 2628 $rmp->{random_seed} ||= $exit->random_seed;
1985 2629
1986 my $data = cf::to_json $rmp; 2630 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2631 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2632 my $meta = "$RANDOMDIR/$md5.meta";
1989 2633
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2635 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2636 undef $fh;
1993 aio_rename "$meta~", $meta; 2637 aio_rename "$meta~", $meta;
… …
2013 my $hp = $exit->stats->hp; 2657 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2658 my $sp = $exit->stats->sp;
2015 2659
2016 $self->enter_link; 2660 $self->enter_link;
2017 2661
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2018 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2019 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2670 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2022 2672
2023 1; 2673 1;
… …
2049 2699
2050 utf8::encode $text; 2700 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2702}
2053 2703
2704=item $client->send_msg ($channel, $msg, $color, [extra...])
2705
2706Send a drawinfo or msg packet to the client, formatting the msg for the
2707client if neccessary. C<$type> should be a string identifying the type of
2708the message, with C<log> being the default. If C<$color> is negative, suppress
2709the message unless the client supports the msg packet.
2710
2711=cut
2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2765sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_;
2767
2768 $msg = $self->pl->expand_cfpod ($msg);
2769
2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2781 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2787 }
2788
2789 $channel = $channel->{id};
2790 }
2791
2792 return unless @extra || length $msg;
2793
2794 if ($self->can_msg) {
2795 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF;
2798
2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2801 } else {
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812
2813 $color &= cf::NDI_COLOR_MASK;
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826}
2827
2054=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2055 2829
2056Sends an exti event to the client. 2830Sends an ext event to the client.
2057 2831
2058=cut 2832=cut
2059 2833
2060sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2061 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2062 2836
2837 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2063 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 }
2065} 2861}
2066 2862
2067=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2068 2864
2069Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2866the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2867C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2868
2073Queries can fail, so check the return code. Or don't, as queries will become 2869Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2870become reliable at some point in the future.
2075 2871
2076=cut 2872=cut
2077 2873
2078sub cf::client::query { 2874sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2875 my ($self, $flags, $text, $cb) = @_;
… …
2087 utf8::encode $text; 2883 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2884 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2885
2090 $self->send_packet ($self->{query_queue}[0][0]) 2886 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2887 if @{ $self->{query_queue} } == 1;
2888
2889 1
2092} 2890}
2093 2891
2094cf::client->attach ( 2892cf::client->attach (
2893 on_connect => sub {
2894 my ($ns) = @_;
2895
2896 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2897 },
2095 on_reply => sub { 2898 on_reply => sub {
2096 my ($ns, $msg) = @_; 2899 my ($ns, $msg) = @_;
2097 2900
2098 # this weird shuffling is so that direct followup queries 2901 # this weird shuffling is so that direct followup queries
2099 # get handled first 2902 # get handled first
… …
2111 } else { 2914 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2915 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2916 }
2114 } 2917 }
2115 }, 2918 },
2919 on_exticmd => sub {
2920 my ($ns, $buf) = @_;
2921
2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2923
2924 if (ref $msg) {
2925 my ($type, $reply, @payload) =
2926 "ARRAY" eq ref $msg
2927 ? @$msg
2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2929
2930 my @reply;
2931
2932 if (my $cb = $EXTICMD{$type}) {
2933 @reply = $cb->($ns, @payload);
2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2939 } else {
2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2941 }
2942
2943 cf::override;
2944 },
2116); 2945);
2117 2946
2118=item $client->async (\&cb) 2947=item $client->async (\&cb)
2119 2948
2120Create a new coroutine, running the specified callback. The coroutine will 2949Create a new coroutine, running the specified callback. The coroutine will
… …
2161our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2162our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2163 2992
2164$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2165 2994
2166$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2995$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math
2997 grepstart grepwhile mapstart mapwhile
2998 sort time
2999));
2167 3000
2168# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2169 3002
2170=pod 3003=pod
2171 3004
2172The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2173 3006
2174 cf::object contr pay_amount pay_player map 3007 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr
3010
2175 cf::object::player player 3011 cf::object::player
2176 cf::player peaceful 3012 player
2177 cf::map trigger 3013
3014 cf::player
3015 peaceful
3016
3017 cf::map
3018 trigger
2178 3019
2179=cut 3020=cut
2180 3021
2181for ( 3022for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2183 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2186) { 3029) {
2187 no strict 'refs'; 3030 no strict 'refs';
… …
2258=back 3101=back
2259 3102
2260=cut 3103=cut
2261 3104
2262############################################################################# 3105#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 3106# the server's init and main functions
2336 3107
2337sub load_facedata { 3108sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 3109 my ($path) = @_;
3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2339 3116
2340 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2341 3118
2342 my $facedata; 3119 my $facedata;
2343 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
… …
2346 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2347 3124
2348 $facedata->{version} == 2 3125 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350 3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
3134
2351 { 3135 {
2352 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2353 3137
2354 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3140 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2359 Coro::cede; 3144
3145 cf::cede_to_tick;
2360 } 3146 }
2361 3147
2362 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 3149 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 3150 my $idx = cf::face::find $face
2365 or next; 3151 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 3152 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 3155 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3156 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 3157 }
2371 Coro::cede; 3158
3159 cf::cede_to_tick;
2372 } 3160 }
2373 } 3161 }
2374 3162
2375 { 3163 {
2376 my $anims = $facedata->{animinfo}; 3164 my $anims = $facedata->{animinfo};
2377 3165
2378 while (my ($anim, $info) = each %$anims) { 3166 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3167 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 3168 cf::cede_to_tick;
2381 } 3169 }
2382 3170
2383 cf::anim::invalidate_all; # d'oh 3171 cf::anim::invalidate_all; # d'oh
2384 } 3172 }
2385 3173
3174 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource};
3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184
3185 if ($info->{type} & 1) {
3186 # prepend meta info
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else {
3195 $data = $info->{data};
3196 }
3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick;
3202 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 }
3222
2386 1 3223 1
2387} 3224}
2388 3225
3226register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_;
3228
3229 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v);
3231 }
3232};
3233
3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
3239 load_resource_file "$MAPDIR/regions"
3240 or die "unable to load regions file\n";
3241
3242 for (cf::region::list) {
3243 $_->{match} = qr/$_->{match}/
3244 if exists $_->{match};
3245 }
3246}
3247
3248sub reload_facedata {
3249 load_facedata "$DATADIR/facedata"
3250 or die "unable to load facedata\n";
3251}
3252
3253sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261}
3262
3263sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n";
3266}
3267
2389sub reload_resources { 3268sub reload_resources {
2390 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3269 warn "reloading resource files...\n";
2391 or die "unable to load regions file\n";#d# 3270
3271 reload_regions;
2392 load_facedata 3272 reload_facedata;
2393 or die "unable to load facedata\n";#d# 3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures;
3276
3277 warn "finished reloading resource files\n";
2394} 3278}
2395 3279
2396sub init { 3280sub init {
2397 reload_resources; 3281 reload_resources;
2398} 3282}
2399 3283
2400sub cfg_load { 3284sub reload_config {
2401 open my $fh, "<:utf8", cf::confdir . "/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2402 or return; 3286 or return;
2403 3287
2404 local $/; 3288 local $/;
2405 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2406 3290
… …
2421sub main { 3305sub main {
2422 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2423 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2424 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2425 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2426 Event::one_event; 3311 Event::one_event;
2427 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2428 }; 3313 };
2429 3314
2430 cfg_load; 3315 reload_config;
2431 db_init; 3316 db_init;
2432 load_extensions; 3317 load_extensions;
2433 3318
2434 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2435 Event::loop; 3320 Event::loop;
… …
2451 }, 3336 },
2452 ); 3337 );
2453 } 3338 }
2454} 3339}
2455 3340
3341sub write_runtime {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time.
3346
3347 IO::AIO::aio_utime $runtime, undef, undef;
3348
3349 my $guard = cf::lock_acquire "write_runtime";
3350
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3352 or return;
3353
3354 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server.
3357
3358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3359 and return;
3360
3361 # always fsync - this file is important
3362 aio_fsync $fh
3363 and return;
3364
3365 # touch it again to show we are up-to-date
3366 aio_utime $fh, undef, undef;
3367
3368 close $fh
3369 or return;
3370
3371 aio_rename "$runtime~", $runtime
3372 and return;
3373
3374 warn "runtime file written.\n";
3375
3376 1
3377}
3378
2456sub emergency_save() { 3379sub emergency_save() {
2457 my $freeze_guard = cf::freeze_mainloop; 3380 my $freeze_guard = cf::freeze_mainloop;
2458 3381
2459 warn "enter emergency perl save\n"; 3382 warn "enter emergency perl save\n";
2460 3383
… …
2464 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
2465 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
2466 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
2467 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
2468 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2469 $pl->save; 3393 $pl->save;
2470 } 3394 }
2471 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
2472 3396
2473 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
2491 3415
2492 warn Carp::longmess "post_cleanup backtrace" 3416 warn Carp::longmess "post_cleanup backtrace"
2493 if $make_core; 3417 if $make_core;
2494} 3418}
2495 3419
2496sub reload() { 3420sub do_reload_perl() {
2497 # can/must only be called in main 3421 # can/must only be called in main
2498 if ($Coro::current != $Coro::main) { 3422 if ($Coro::current != $Coro::main) {
2499 warn "can only reload from main coroutine"; 3423 warn "can only reload from main coroutine";
2500 return; 3424 return;
2501 } 3425 }
… …
2521 3445
2522 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
2523 for (;;) { 3447 for (;;) {
2524 BDB::flush; 3448 BDB::flush;
2525 IO::AIO::flush; 3449 IO::AIO::flush;
2526 Coro::cede; 3450 Coro::cede_notself;
2527 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
2528 warn "iterate..."; 3452 warn "iterate...";
2529 } 3453 }
2530 3454
2531 ++$RELOAD; 3455 ++$RELOAD;
… …
2535 %EXT_CORO = (); 3459 %EXT_CORO = ();
2536 3460
2537 warn "removing commands"; 3461 warn "removing commands";
2538 %COMMAND = (); 3462 %COMMAND = ();
2539 3463
2540 warn "removing ext commands"; 3464 warn "removing ext/exti commands";
2541 %EXTCMD = (); 3465 %EXTCMD = ();
3466 %EXTICMD = ();
2542 3467
2543 warn "unloading/nuking all extensions"; 3468 warn "unloading/nuking all extensions";
2544 for my $pkg (@EXTS) { 3469 for my $pkg (@EXTS) {
2545 warn "... unloading $pkg"; 3470 warn "... unloading $pkg";
2546 3471
… …
2576 Symbol::delete_package "safe::$_" 3501 Symbol::delete_package "safe::$_"
2577 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2578 3503
2579 warn "unloading cf.pm \"a bit\""; 3504 warn "unloading cf.pm \"a bit\"";
2580 delete $INC{"cf.pm"}; 3505 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"};
2581 3507
2582 # don't, removes xs symbols, too, 3508 # don't, removes xs symbols, too,
2583 # and global variables created in xs 3509 # and global variables created in xs
2584 #Symbol::delete_package __PACKAGE__; 3510 #Symbol::delete_package __PACKAGE__;
2585 3511
… …
2588 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
2589 require cf; 3515 require cf;
2590 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2591 3517
2592 warn "loading config and database again"; 3518 warn "loading config and database again";
2593 cf::cfg_load; 3519 cf::reload_config;
2594 3520
2595 warn "loading extensions"; 3521 warn "loading extensions";
2596 cf::load_extensions; 3522 cf::load_extensions;
2597 3523
2598 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
… …
2600 warn "reattaching attachments to maps"; 3526 warn "reattaching attachments to maps";
2601 reattach $_ for values %MAP; 3527 reattach $_ for values %MAP;
2602 warn "reattaching attachments to players"; 3528 warn "reattaching attachments to players";
2603 reattach $_ for values %PLAYER; 3529 reattach $_ for values %PLAYER;
2604 3530
2605 warn "loading reloadable resources";
2606 reload_resources;
2607
2608 warn "leaving sync_job"; 3531 warn "leaving sync_job";
2609 3532
2610 1 3533 1
2611 } or do { 3534 } or do {
2612 warn $@; 3535 warn $@;
… …
2617 warn "reloaded"; 3540 warn "reloaded";
2618}; 3541};
2619 3542
2620our $RELOAD_WATCHER; # used only during reload 3543our $RELOAD_WATCHER; # used only during reload
2621 3544
3545sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here.
3548
3549 $RELOAD_WATCHER ||= Event->timer (
3550 reentrant => 0,
3551 after => 0,
3552 data => WF_AUTOCANCEL,
3553 cb => sub {
3554 do_reload_perl;
3555 undef $RELOAD_WATCHER;
3556 },
3557 );
3558}
3559
2622register_command "reload" => sub { 3560register_command "reload" => sub {
2623 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2624 3562
2625 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2626 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
2627 3565 async {
2628 # doing reload synchronously and two reloads happen back-to-back, 3566 $Coro::current->{desc} = "perl_reload";
2629 # coro crashes during coro_state_free->destroy here.
2630
2631 $RELOAD_WATCHER ||= Event->timer (
2632 reentrant => 0,
2633 after => 0,
2634 data => WF_AUTOCANCEL,
2635 cb => sub {
2636 reload; 3567 reload_perl;
2637 undef $RELOAD_WATCHER;
2638 },
2639 ); 3568 };
2640 } 3569 }
2641}; 3570};
2642 3571
2643unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2644 3573
… …
2646 3575
2647our @WAIT_FOR_TICK; 3576our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN; 3577our @WAIT_FOR_TICK_BEGIN;
2649 3578
2650sub wait_for_tick { 3579sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main;
3582
2651 my $signal = new Coro::Signal; 3583 my $signal = new Coro::Signal;
2652 push @WAIT_FOR_TICK, $signal; 3584 push @WAIT_FOR_TICK, $signal;
2653 $signal->wait; 3585 $signal->wait;
2654} 3586}
2655 3587
2656sub wait_for_tick_begin { 3588sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main;
3591
2657 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2658 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2659 $signal->wait; 3594 $signal->wait;
2660} 3595}
2661 3596
… …
2670 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2671 unless ++$bug_warning > 10; 3606 unless ++$bug_warning > 10;
2672 return; 3607 return;
2673 } 3608 }
2674 3609
2675 $NOW = Event::time; 3610 $NOW = $tick_start = Event::time;
2676 3611
2677 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3613
2678 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
2679 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
2680 3616
2681 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2682 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
2683 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
2684 write_runtime 3621 write_runtime
2685 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
2686 }; 3623 };
2687 } 3624 }
2688 3625
… …
2691 } 3628 }
2692 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
2693 $sig->send; 3630 $sig->send;
2694 } 3631 }
2695 3632
2696# my $AFTER = Event::time; 3633 $NOW = Event::time;
2697# warn $AFTER - $NOW;#d#
2698 3634
2699 # if we are delayed by four ticks or more, skip them all 3635 # if we are delayed by four ticks or more, skip them all
2700 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2701 3637
2702 $TICK_WATCHER->at ($NEXT_TICK); 3638 $TICK_WATCHER->at ($NEXT_TICK);
2703 $TICK_WATCHER->start; 3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643
3644 _post_tick;
2704 }, 3645 },
2705); 3646);
2706 3647
2707{ 3648{
3649 BDB::min_parallel 8;
2708 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
2709 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
2710 reentrant => 0, 3652 reentrant => 0,
2711 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
2712 poll => 'r', 3654 poll => 'r',
2713 prio => 0, 3655 prio => 0,
2714 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
2715 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
2716 ); 3658 );
2717 BDB::min_parallel 8;
2718 3659
2719 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
2720 my $status; 3661 my $status;
2721 my $current = $Coro::current; 3662 my $current = $Coro::current;
2722 ( 3663 (
… …
2731 ) 3672 )
2732 }; 3673 };
2733 3674
2734 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
2735 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2736 3681
2737 cf::sync_job { 3682 cf::sync_job {
2738 eval { 3683 eval {
2739 BDB::db_env_open 3684 BDB::db_env_open
2740 $DB_ENV, 3685 $DB_ENV,
2741 $BDB_ENV_DIR, 3686 $BDBDIR,
2742 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2743 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2744 0666; 3689 0666;
2745 3690
2746 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2747
2748 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2749 $DB_ENV->set_lk_detect;
2750 }; 3692 };
2751 3693
2752 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
2753 }; 3695 };
2754 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
2755} 3728}
2756 3729
2757{ 3730{
2758 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
2759 3732
… …
2762 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
2763 reentrant => 0, 3736 reentrant => 0,
2764 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
2765 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
2766 poll => 'r', 3739 poll => 'r',
2767 prio => 6, 3740 prio => 0,
2768 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
2769 ); 3742 );
2770} 3743}
2771 3744
3745my $_log_backtrace;
3746
3747sub _log_backtrace {
3748 my ($msg, @addr) = @_;
3749
3750 $msg =~ s/\n//;
3751
3752 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace;
3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3758 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr;
3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3762 or die "addr2line: $!";
3763
3764 my @funcs;
3765 my @res = <$fh>;
3766 chomp for @res;
3767 while (@res) {
3768 my ($func, $line) = splice @res, 0, 2, ();
3769 push @funcs, "[$func] $line";
3770 }
3771
3772 @funcs
3773 };
3774
3775 LOG llevInfo, "[ABT] $msg\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace;
3778 };
3779 } else {
3780 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n";
3782 }
3783}
3784
3785# load additional modules
3786use cf::pod;
3787
2772END { cf::emergency_save } 3788END { cf::emergency_save }
2773 3789
27741 37901
2775 3791

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines