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

Diff Legend

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