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.238 by root, Sat Apr 14 07:23:00 2007 UTC vs.
Revision 1.400 by root, Mon Dec 17 06:36:34 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.52 (); 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";
58 62
59our $TICK = MAX_TIME * 1e-6; 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";
74
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
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 97
84# 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 ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 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
87binmode STDOUT; 105binmode STDOUT;
88binmode STDERR; 106binmode STDERR;
89 107
90# read virtual server time, if available 108# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 109unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 110 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 111 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 112 $RUNTIME = <$fh> + 0.;
95} 113}
96 114
97mkdir cf::localdir; 115mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 117
104our $EMERGENCY_POSITION; 118our $EMERGENCY_POSITION;
105 119
106sub cf::map::normalise; 120sub cf::map::normalise;
107 121
… …
118=item $cf::RUNTIME 132=item $cf::RUNTIME
119 133
120The 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
121every server tick. 135every server tick.
122 136
123=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
124 140
125The perl library directory, where extensions and cf-specific modules can 141Various directories - "/etc", read-only install directory, perl-library
126be 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.
127 145
128=item $cf::NOW 146=item $cf::NOW
129 147
130The time of the last (current) server tick. 148The time of the last (current) server tick.
131 149
132=item $cf::TICK 150=item $cf::TICK
133 151
134The interval between server ticks, in seconds. 152The interval between server ticks, in seconds.
135 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
136=item %cf::CFG 164=item %cf::CFG
137 165
138Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
139from wherever your confdir points to. 167from wherever your confdir points to.
140 168
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 169=item cf::wait_for_tick, cf::wait_for_tick_begin
142 170
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 172returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick. 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.
147 180
148=back 181=back
149 182
150=cut 183=cut
151 184
152BEGIN { 185BEGIN {
153 *CORE::GLOBAL::warn = sub { 186 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 187 my $msg = join "", @_;
155 utf8::encode $msg;
156 188
157 $msg .= "\n" 189 $msg .= "\n"
158 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
191
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
159 193
160 LOG llevError, $msg; 194 LOG llevError, $msg;
161 }; 195 };
162} 196}
163 197
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@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';
169@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)
170 205
171# 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
172# within the Safe compartment. 207# within the Safe compartment.
173for my $pkg (qw( 208for my $pkg (qw(
174 cf::global cf::attachable 209 cf::global cf::attachable
… …
179)) { 214)) {
180 no strict 'refs'; 215 no strict 'refs';
181 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
182} 217}
183 218
184$Event::DIED = sub { 219$EV::DIED = sub {
185 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
186}; 221};
222
223#############################################################################
187 224
188=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
189 226
190=over 4 227=over 4
191 228
… …
210 $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;
211 $d 248 $d
212 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
213} 250}
214 251
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
218 253
219Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
220 255
221=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
222 257
223Converts 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]) }
224 266
225=item cf::lock_wait $string 267=item cf::lock_wait $string
226 268
227Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
228 270
… …
231Wait 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
232a 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,
233for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
234returned. 276returned.
235 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
236Lock 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
237uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
238 283
284=item $locked = cf::lock_active $string
285
286Return true if the lock is currently active, i.e. somebody has locked it.
287
239=cut 288=cut
240 289
241our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
242 292
243sub lock_wait($) { 293sub lock_wait($) {
244 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#
245 300
246 # wait for lock, if any 301 # wait for lock, if any
247 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
248 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
249 Coro::schedule; 304 Coro::schedule;
… …
255 310
256 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
257 lock_wait $key; 312 lock_wait $key;
258 313
259 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
260 316
261 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
262 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
264 } 321 }
322}
323
324sub lock_active($) {
325 my ($key) = @_;
326
327 ! ! $LOCK{$key}
265} 328}
266 329
267sub freeze_mainloop { 330sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 331 return unless $TICK_WATCHER->is_active;
269 332
… …
272 }; 335 };
273 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
274 $guard 337 $guard
275} 338}
276 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
277=item cf::async { BLOCK } 413=item cf::async { BLOCK }
278 414
279Currently the same as Coro::async_pool, meaning you cannot use 415Currently the same as Coro::async_pool, meaning you cannot use
280C<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
281thing you are allowed to do is call C<prio> on it. 417thing you are allowed to do is call C<prio> on it.
… …
284 420
285BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
286 422
287=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
288 424
289The design of crossfire+ requires that the main coro ($Coro::main) is 425The design of Deliantra requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 426is always able to handle events or runnable, as Deliantra is only
291reentrant. 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.
292 429
293If 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
294the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
295server 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
296fast or be very important. 433fast or be very important.
… …
299 436
300sub sync_job(&) { 437sub sync_job(&) {
301 my ($job) = @_; 438 my ($job) = @_;
302 439
303 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
441 my $time = EV::time;
442
304 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
306 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
307 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 449 # (but this is cancel-safe)
309 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
310 451
311 my $busy = 1; 452 my $busy = 1;
312 my @res; 453 my @res;
313 454
314 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
315 @res = eval { $job->() }; 457 @res = eval { $job->() };
316 warn $@ if $@; 458 warn $@ if $@;
317 undef $busy; 459 undef $busy;
318 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
319 461
320 while ($busy) { 462 while ($busy) {
321 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
322 } 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
323 476
324 wantarray ? @res : $res[0] 477 wantarray ? @res : $res[0]
325 } else { 478 } else {
326 # we are in another coroutine, how wonderful, everything just works 479 # we are in another coroutine, how wonderful, everything just works
327 480
… …
347 $EXT_CORO{$coro+0} = $coro; 500 $EXT_CORO{$coro+0} = $coro;
348 501
349 $coro 502 $coro
350} 503}
351 504
352sub write_runtime { 505=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 506
355 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.
356 511
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 512=cut
358 or return;
359 513
360 my $value = $cf::RUNTIME + 90 + 10; 514sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 515 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 516
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 517 # we seemingly have to make a local copy of the whole thing,
365 and return; 518 # otherwise perl prematurely frees the stuff :/
519 # TODO: investigate and fix (likely this will be rather laborious)
366 520
367 # always fsync - this file is important 521 my @res = Coro::Util::fork_eval {
368 aio_fsync $fh 522 reset_signals;
369 and return; 523 &$cb
524 }, @args;
370 525
371 close $fh 526 wantarray ? @res : $res[-1]
372 or return; 527}
373 528
374 aio_rename "$runtime~", $runtime 529=item $value = cf::db_get $family => $key
375 and return;
376 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
377 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"
378} 654}
379 655
380=item cf::datalog type => key => value, ... 656=item cf::datalog type => key => value, ...
381 657
382Log 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.
… …
400attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
402 678
403In 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>
404C<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
405crossfire+). 681Deliantra).
406 682
407=over 4 683=over 4
408 684
409=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
410 686
… …
573 $registry = $CB_TYPE[$object_type] ||= []; 849 $registry = $CB_TYPE[$object_type] ||= [];
574 850
575 } elsif ($type eq "subtype") { 851 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 852 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 853 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 854 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 855
580 } elsif ($type eq "package") { 856 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 857 my $pkg = shift @arg;
582 858
583 while (my ($name, $id) = each %cb_id) { 859 while (my ($name, $id) = each %cb_id) {
… …
612 _attach $registry, $klass, @attach; 888 _attach $registry, $klass, @attach;
613 } 889 }
614 890
615 $obj->{$name} = \%arg; 891 $obj->{$name} = \%arg;
616 } else { 892 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 893 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 894 }
619 895
620 $obj->{_attachment}{$name} = undef; 896 $obj->{_attachment}{$name} = undef;
621} 897}
622 898
… …
624 if (ref $_[0]) { 900 if (ref $_[0]) {
625 _object_attach @_; 901 _object_attach @_;
626 } else { 902 } else {
627 _attach shift->_attach_registry, @_; 903 _attach shift->_attach_registry, @_;
628 } 904 }
905 _recalc_want;
629}; 906};
630 907
631# all those should be optimised 908# all those should be optimised
632sub cf::attachable::detach { 909sub cf::attachable::detach {
633 my ($obj, $name) = @_; 910 my ($obj, $name) = @_;
… …
636 delete $obj->{_attachment}{$name}; 913 delete $obj->{_attachment}{$name};
637 reattach ($obj); 914 reattach ($obj);
638 } else { 915 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 916 Carp::croak "cannot, currently, detach class attachments";
640 } 917 }
918 _recalc_want;
641}; 919};
642 920
643sub cf::attachable::attached { 921sub cf::attachable::attached {
644 my ($obj, $name) = @_; 922 my ($obj, $name) = @_;
645 923
… …
660 "; 938 ";
661 die if $@; 939 die if $@;
662} 940}
663 941
664our $override; 942our $override;
665our @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?
666 944
667sub override { 945sub override {
668 $override = 1; 946 $override = 1;
669 @invoke_results = (); 947 @INVOKE_RESULTS = (@_);
670} 948}
671 949
672sub do_invoke { 950sub do_invoke {
673 my $event = shift; 951 my $event = shift;
674 my $callbacks = shift; 952 my $callbacks = shift;
675 953
676 @invoke_results = (); 954 @INVOKE_RESULTS = ();
677 955
678 local $override; 956 local $override;
679 957
680 for (@$callbacks) { 958 for (@$callbacks) {
681 eval { &{$_->[1]} }; 959 eval { &{$_->[1]} };
… …
698 976
699Generate an object-specific event with the given arguments. 977Generate an object-specific event with the given arguments.
700 978
701This 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
702removed 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
703results (if you must, access C<@cf::invoke_results> directly). 981results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704 982
705=back 983=back
706 984
707=cut 985=cut
708 986
709############################################################################# 987#############################################################################
710# 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}
711 1031
712sub reattach { 1032sub reattach {
713 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
714 my ($obj) = @_; 1034 my ($obj) = @_;
715 1035
… …
736cf::attachable->attach ( 1056cf::attachable->attach (
737 prio => -1000000, 1057 prio => -1000000,
738 on_instantiate => sub { 1058 on_instantiate => sub {
739 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
740 1060
741 $data = from_json $data; 1061 $data = decode_json $data;
742 1062
743 for (@$data) { 1063 for (@$data) {
744 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
745 1065
746 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
… …
762sub object_freezer_save { 1082sub object_freezer_save {
763 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
764 1084
765 sync_job { 1085 sync_job {
766 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
767 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
768 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
769 1090
770 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
771 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
772 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
773 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
774 close $fh; 1095 close $fh;
775 1096
776 if (@$objs) { 1097 if (@$objs) {
777 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) {
778 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
779 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
780 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
781 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
782 close $fh; 1103 close $fh;
783 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
784 } 1105 }
… …
792 } 1113 }
793 } else { 1114 } else {
794 aio_unlink $filename; 1115 aio_unlink $filename;
795 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
796 } 1117 }
797 } 1118 };
798} 1119}
799 1120
800sub object_freezer_as_string { 1121sub object_freezer_as_string {
801 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
802 1123
… …
814 or return; 1135 or return;
815 1136
816 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
817 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
818 or return; 1139 or return;
1140
819 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
820 } 1143 }
821 1144
1145 utf8::decode (my $decname = $filename);
822 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1147 $decname, length $data, scalar @{$av || []};
1148
824 return ($data, $av); 1149 ($data, $av)
825} 1150}
1151
1152=head2 COMMAND CALLBACKS
1153
1154=over 4
1155
1156=cut
826 1157
827############################################################################# 1158#############################################################################
828# command handling &c 1159# command handling &c
829 1160
830=item cf::register_command $name => \&callback($ob,$args); 1161=item cf::register_command $name => \&callback($ob,$args);
… …
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1174 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1175}
845 1176
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1177=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1178
848Register 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.
849 1184
850If 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
851called. 1186called.
852 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
853=cut 1199=cut
854 1200
855sub register_extcmd { 1201sub register_extcmd {
856 my ($name, $cb) = @_; 1202 my ($name, $cb) = @_;
857 1203
858 $EXTCMD{$name} = $cb; 1204 $EXTCMD{$name} = $cb;
1205}
1206
1207sub register_exticmd {
1208 my ($name, $cb) = @_;
1209
1210 $EXTICMD{$name} = $cb;
859} 1211}
860 1212
861cf::player->attach ( 1213cf::player->attach (
862 on_command => sub { 1214 on_command => sub {
863 my ($pl, $name, $params) = @_; 1215 my ($pl, $name, $params) = @_;
… …
872 cf::override; 1224 cf::override;
873 }, 1225 },
874 on_extcmd => sub { 1226 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1227 my ($pl, $buf) = @_;
876 1228
877 my $msg = eval { from_json $buf }; 1229 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1230
879 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
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1239 if (my $cb = $EXTCMD{$type}) {
881 if (my %reply = $cb->($pl, $msg)) { 1240 @reply = $cb->($pl, @payload);
882 $pl->ext_reply ($msg->{msgid}, %reply);
883 }
884 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
885 } else { 1246 } else {
886 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887 } 1248 }
888 1249
889 cf::override; 1250 cf::override;
890 }, 1251 },
891); 1252);
892 1253
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1254sub load_extensions {
1255 cf::sync_job {
1256 my %todo;
1257
928 for my $ext (<$LIBDIR/*.ext>) { 1258 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1259 next unless -r $path;
930 eval { 1260
931 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;
932 1 1318 }
933 } or warn "$ext not loaded: $@"; 1319
1320 skip:
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1322 unless $progress;
1323 }
934 } 1324 };
935} 1325}
936 1326
937############################################################################# 1327#############################################################################
938 1328
1329=back
1330
939=head2 CORE EXTENSIONS 1331=head2 CORE EXTENSIONS
940 1332
941Functions and methods that extend core crossfire objects. 1333Functions and methods that extend core crossfire objects.
942 1334
943=cut 1335=cut
… …
948 1340
949=head3 cf::player 1341=head3 cf::player
950 1342
951=over 4 1343=over 4
952 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
953=item cf::player::find $login 1359=item cf::player::find $login
954 1360
955Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
956 1362
957=cut 1363=cut
958 1364
959sub playerdir($) { 1365sub playerdir($) {
960 cf::localdir 1366 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1367 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1368}
966 1369
967sub path($) { 1370sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1371 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
999 1402
1000 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1001 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;
1002 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1003 } 1411 }
1004 } 1412 }
1005} 1413}
1006 1414
… …
1016 1424
1017 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1018 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1019 1427
1020 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1021 Coro::cede; 1429 cf::cede_to_tick;
1022} 1430}
1023 1431
1024sub new($) { 1432sub new($) {
1025 my ($login) = @_; 1433 my ($login) = @_;
1026 1434
… …
1030 $self->{deny_save} = 1; 1438 $self->{deny_save} = 1;
1031 1439
1032 $cf::PLAYER{$login} = $self; 1440 $cf::PLAYER{$login} = $self;
1033 1441
1034 $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 (@_);
1035} 1453}
1036 1454
1037=item $pl->quit_character 1455=item $pl->quit_character
1038 1456
1039Nukes the player without looking back. If logged in, the connection will 1457Nukes the player without looking back. If logged in, the connection will
… …
1088while and may block, so not sync_job-capable, ever. 1506while and may block, so not sync_job-capable, ever.
1089 1507
1090=cut 1508=cut
1091 1509
1092sub list_logins { 1510sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1511 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1512 or return [];
1095 1513
1096 my @logins; 1514 my @logins;
1097 1515
1098 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") {
1099 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1100 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1101 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1102 1525
1103 utf8::decode $login; 1526 utf8::decode $login;
1104 push @logins, $login; 1527 push @logins, $login;
1105 } 1528 }
1106 1529
… …
1133 } 1556 }
1134 1557
1135 \@paths 1558 \@paths
1136} 1559}
1137 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
1138=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1139 1655
1140Sends an ext reply to the player. 1656Sends an ext reply to the player.
1141 1657
1142=cut 1658=cut
1143 1659
1144sub ext_reply($$%) { 1660sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1146 1662
1147 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1664}
1151 1665
1152=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1153 1667
1154Sends an ext event to the client. 1668Sends an ext event to the client.
1155 1669
1156=cut 1670=cut
1157 1671
1158sub ext_event($$%) { 1672sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1160 1674
1161 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1162} 1676}
1163 1677
1164=head3 cf::region 1678=head3 cf::region
1165 1679
1166=over 4 1680=over 4
… …
1169 1683
1170package cf::region; 1684package cf::region;
1171 1685
1172=item cf::region::find_by_path $path 1686=item cf::region::find_by_path $path
1173 1687
1174Tries 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.
1175 1689
1176=cut 1690=cut
1177 1691
1178sub find_by_path($) { 1692sub find_by_path($) {
1179 my ($path) = @_; 1693 my ($path) = @_;
1180 1694
1181 my ($match, $specificity); 1695 my ($match, $specificity);
1182 1696
1183 for my $region (list) { 1697 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1185 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1187 } 1701 }
1188 } 1702 }
1189 1703
… …
1253 my ($self, $merge) = @_; 1767 my ($self, $merge) = @_;
1254 1768
1255 # we have to keep some variables in memory intact 1769 # we have to keep some variables in memory intact
1256 local $self->{path}; 1770 local $self->{path};
1257 local $self->{load_path}; 1771 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1772
1261 $self->SUPER::thawer_merge ($merge); 1773 $self->SUPER::thawer_merge ($merge);
1262} 1774}
1263 1775
1264sub normalise { 1776sub normalise {
… …
1311 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1312 return $self; 1824 return $self;
1313 } 1825 }
1314 } 1826 }
1315 1827
1316 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1317 () 1829 ()
1318} 1830}
1319 1831
1320sub init { 1832sub init {
1321 my ($self) = @_; 1833 my ($self) = @_;
… …
1336 1848
1337# the original (read-only) location 1849# the original (read-only) location
1338sub load_path { 1850sub load_path {
1339 my ($self) = @_; 1851 my ($self) = @_;
1340 1852
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1853 "$MAPDIR/$self->{path}.map"
1342} 1854}
1343 1855
1344# the temporary/swap location 1856# the temporary/swap location
1345sub save_path { 1857sub save_path {
1346 my ($self) = @_; 1858 my ($self) = @_;
1347 1859
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1861 "$TMPDIR/$path.map"
1350} 1862}
1351 1863
1352# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1353sub uniq_path { 1865sub uniq_path {
1354 my ($self) = @_; 1866 my ($self) = @_;
1355 1867
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1869 "$UNIQUEDIR/$path"
1358} 1870}
1359 1871
1360# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1361# all maps in C++... 1873# all maps in C++...
1362sub change_all_map_light { 1874sub change_all_map_light {
… …
1364 1876
1365 $_->change_map_light ($change) 1877 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1878 for grep $_->outdoor, values %cf::MAP;
1367} 1879}
1368 1880
1881sub decay_objects {
1882 my ($self) = @_;
1883
1884 return if $self->{deny_reset};
1885
1886 $self->do_decay_objects;
1887}
1888
1369sub unlink_save { 1889sub unlink_save {
1370 my ($self) = @_; 1890 my ($self) = @_;
1371 1891
1372 utf8::encode (my $save = $self->save_path); 1892 utf8::encode (my $save = $self->save_path);
1373 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1893 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1376 1896
1377sub load_header_from($) { 1897sub load_header_from($) {
1378 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1379 1899
1380 utf8::encode $path; 1900 utf8::encode $path;
1381 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1382 # or return;
1383
1384 $self->_load_header ($path)
1385 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;
1386 1909
1387 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1388 1911
1389 1 1912 1
1390} 1913}
… …
1429 $self->load_header_orig 1952 $self->load_header_orig
1430 or return; 1953 or return;
1431 $self->prepare_orig; 1954 $self->prepare_orig;
1432 } 1955 }
1433 1956
1957 $self->{deny_reset} = 1
1958 if $self->no_reset;
1959
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1960 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1961 unless $self->default_region;
1436 1962
1437 1 1963 1
1438} 1964}
… …
1441sub find { 1967sub find {
1442 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1443 1969
1444 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1445 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1446 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1447 1974
1448 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1449 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
1450 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1451 or return; 1980 or return;
1452 1981
1453 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1454 1983
1455 $map->load_header 1984 $map->load_header
1456 or return; 1985 or return;
1457 1986
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1461 $map->reset; 1992 $map->reset;
1462 undef $guard;
1463 return find $path; 1993 return find $path;
1464 } 1994 }
1465 1995
1466 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1467 } 1997 }
… …
1474 my ($self) = @_; 2004 my ($self) = @_;
1475 2005
1476 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1477 2007
1478 my $path = $self->{path}; 2008 my $path = $self->{path};
2009
2010 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1480 2012
2013 return unless $self->valid;
1481 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1482 2015
1483 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1484 2017
1485 $self->alloc; 2018 $self->alloc;
1486 2019
1487 $self->pre_load; 2020 $self->pre_load;
2021 cf::cede_to_tick;
1488 2022
1489 $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)
1490 or return; 2026 or return;
1491 2027
1492 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1493 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1494 2030
1495 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1496 utf8::encode $uniq; 2032 utf8::encode $uniq;
1497 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1498 $self->clear_unique_items; 2035 $self->clear_unique_items;
1499 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1500 } 2039 }
1501 } 2040 }
1502 2041
1503 Coro::cede; 2042 $f->resolve_delayed_derefs;
1504 2043
2044 cf::cede_to_tick;
1505 # now do the right thing for maps 2045 # now do the right thing for maps
1506 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1507
1508 unless ($self->{deny_activate}) {
1509 $self->decay_objects;
1510 $self->fix_auto_apply;
1511 $self->update_buttons;
1512 Coro::cede;
1513 $self->set_darkness_map;
1514 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1515 unless $self->difficulty; 2048 unless $self->difficulty;
1516 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;
1517 $self->activate; 2058 $self->activate;
2059 }
2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_IN_MEMORY);
1518 } 2065 }
1519 2066
1520 $self->post_load; 2067 $self->post_load;
1521
1522 $self->in_memory (cf::MAP_IN_MEMORY);
1523} 2068}
1524 2069
1525sub customise_for { 2070sub customise_for {
1526 my ($self, $ob) = @_; 2071 my ($self, $ob) = @_;
1527 2072
1528 return find "~" . $ob->name . "/" . $self->{path} 2073 return find "~" . $ob->name . "/" . $self->{path}
1529 if $self->per_player; 2074 if $self->per_player;
1530 2075
2076# return find "?party/" . $ob->name . "/" . $self->{path}
2077# if $self->per_party;
2078
1531 $self 2079 $self
1532} 2080}
1533 2081
1534# 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
1535sub load_diag { 2083sub load_neighbours {
1536 my ($map) = @_; 2084 my ($map) = @_;
1537 2085
1538 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1539 2087
1540 for (0 .. 3) { 2088 for (0 .. 3) {
1541 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1542 or next; 2090 or next;
1543 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1544 or next; 2092 or next;
1545 $neigh->load; 2093 $neigh->load;
1546 2094
2095 push @neigh,
1547 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1548 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1549 } 2098 }
1550 2099
1551 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1552 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1553 or next; 2103 or next;
1554 $neigh->load; 2104 $neigh->load;
1555 } 2105 }
1556} 2106}
1557 2107
… …
1562} 2112}
1563 2113
1564sub do_load_sync { 2114sub do_load_sync {
1565 my ($map) = @_; 2115 my ($map) = @_;
1566 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1567 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1568} 2121}
1569 2122
1570our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1571our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1572 2125
1573sub find_async { 2126sub find_async {
1574 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1575 2128
1576 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1577 2130
1578 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1579 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1580 } 2133 }
1581 2134
1582 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1583 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1584 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1585 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1586 my $map = find $path 2142 if (my $map = find $k) {
1587 or next;
1588 $map->load; 2143 $map->load if $v;
2144 }
1589 2145
1590 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1591 } 2147 }
1592 } 2148 }
1593 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1594 }; 2150 };
1595 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
… …
1598} 2154}
1599 2155
1600sub save { 2156sub save {
1601 my ($self) = @_; 2157 my ($self) = @_;
1602 2158
1603 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1604 2160
1605 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1606 2162
1607 return unless $self->dirty; 2163 return unless $self->dirty;
1608 2164
… …
1614 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1615 2171
1616 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1617 2173
1618 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1619 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1620 }; 2177 };
1621 2178
1622 if ($uniq) { 2179 if ($uniq) {
1623 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1631 my ($self) = @_; 2188 my ($self) = @_;
1632 2189
1633 # save first because save cedes 2190 # save first because save cedes
1634 $self->save; 2191 $self->save;
1635 2192
1636 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
1637 2194
1638 return if $self->players; 2195 return if $self->players;
1639 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
1640 return if $self->{deny_save}; 2197 return if $self->{deny_save};
1641 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
1642 $self->clear; 2203 $self->clear;
1643 $self->in_memory (cf::MAP_SWAPPED);
1644} 2204}
1645 2205
1646sub reset_at { 2206sub reset_at {
1647 my ($self) = @_; 2207 my ($self) = @_;
1648 2208
1649 # TODO: safety, remove and allow resettable per-player maps 2209 # TODO: safety, remove and allow resettable per-player maps
1650 return 1e99 if $self->isa ("ext::map_per_player");#d#
1651 return 1e99 if $self->{deny_reset}; 2210 return 1e99 if $self->{deny_reset};
1652 2211
1653 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2212 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1654 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;
1655 2214
… …
1666 my ($self) = @_; 2225 my ($self) = @_;
1667 2226
1668 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1669 2228
1670 return if $self->players; 2229 return if $self->players;
1671 return if $self->isa ("ext::map_per_player");#d#
1672 2230
1673 warn "resetting map ", $self->path;#d# 2231 warn "resetting map ", $self->path;
1674 2232
1675 $self->in_memory (cf::MAP_SWAPPED); 2233 $self->in_memory (cf::MAP_SWAPPED);
1676 2234
1677 # need to save uniques path 2235 # need to save uniques path
1678 unless ($self->{deny_save}) { 2236 unless ($self->{deny_save}) {
… …
1682 if $uniq; 2240 if $uniq;
1683 } 2241 }
1684 2242
1685 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
1686 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
1687 $self->clear; 2247 $self->clear;
1688
1689 $_->clear_links_to ($self) for values %cf::MAP;
1690 2248
1691 $self->unlink_save; 2249 $self->unlink_save;
1692 $self->destroy; 2250 $self->destroy;
1693} 2251}
1694 2252
1695my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
1696 2254
1697sub nuke { 2255sub nuke {
1698 my ($self) = @_; 2256 my ($self) = @_;
1699 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
1700 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
1701 2262
1702 $self->unlink_save; 2263 $self->unlink_save;
1703 2264
1704 bless $self, "cf::map"; 2265 bless $self, "cf::map";
1705 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
1706 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
1707 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
1708 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1709 2270
1710 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
1711 2273
1712 $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 ]
1713} 2311}
1714 2312
1715=item cf::map::unique_maps 2313=item cf::map::unique_maps
1716 2314
1717Returns an arrayref of paths of all shared maps that have 2315Returns an arrayref of paths of all shared maps that have
1718instantiated unique items. May block. 2316instantiated unique items. May block.
1719 2317
1720=cut 2318=cut
1721 2319
1722sub unique_maps() { 2320sub unique_maps() {
1723 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2321 [
1724 or return; 2322 map {
1725
1726 my @paths;
1727
1728 for (@$files) {
1729 utf8::decode $_; 2323 utf8::decode $_;
1730 next if /\.pst$/; 2324 /\.map$/
1731 next unless /^$PATH_SEP/o; 2325 ? normalise $_
1732 2326 : ()
1733 push @paths, cf::map::normalise $_; 2327 } @{ aio_readdir $UNIQUEDIR or [] }
1734 } 2328 ]
1735
1736 \@paths
1737} 2329}
1738 2330
1739package cf; 2331package cf;
1740 2332
1741=back 2333=back
… …
1759 map { $_, inv_recursive_ $_->inv } @_ 2351 map { $_, inv_recursive_ $_->inv } @_
1760} 2352}
1761 2353
1762sub inv_recursive { 2354sub inv_recursive {
1763 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 }
1764} 2384}
1765 2385
1766package cf; 2386package cf;
1767 2387
1768=back 2388=back
… …
1787 2407
1788 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2408 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1789 2409
1790 if ($self->{record_replies}) { 2410 if ($self->{record_replies}) {
1791 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2411 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2412
1792 } 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 {
1793 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
1794 $self->message ($msg, $flags); 2422 $self->message ($msg, $flags);
2423 }
1795 } 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 (@_);
1796} 2435}
1797 2436
1798=item $player_object->may ("access") 2437=item $player_object->may ("access")
1799 2438
1800Returns wether the given player is authorized to access resource "access" 2439Returns wether the given player is authorized to access resource "access"
… …
1847 $self->deactivate_recursive; 2486 $self->deactivate_recursive;
1848 2487
1849 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2488 return if UNIVERSAL::isa $self->map, "ext::map_link";
1850 2489
1851 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1852 if $self->map; 2491 if $self->map && $self->map->{path} ne "{link}";
1853 2492
1854 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2493 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1855} 2494}
1856 2495
1857sub cf::object::player::leave_link { 2496sub cf::object::player::leave_link {
1858 my ($self, $map, $x, $y) = @_; 2497 my ($self, $map, $x, $y) = @_;
2498
2499 return unless $self->contr->active;
1859 2500
1860 my $link_pos = delete $self->{_link_pos}; 2501 my $link_pos = delete $self->{_link_pos};
1861 2502
1862 unless ($map) { 2503 unless ($map) {
1863 # restore original map position 2504 # restore original map position
… …
1877 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
1878 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
1879 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
1880 2521
1881 $map->load; 2522 $map->load;
1882 $map->load_diag; 2523 $map->load_neighbours;
1883 2524
1884 return unless $self->contr->active; 2525 return unless $self->contr->active;
1885 $self->activate_recursive; 2526 $self->activate_recursive;
1886 2527
1887 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1888 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
1889} 2530}
1890 2531
1891cf::player->attach ( 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1892 on_logout => sub {
1893 my ($pl) = @_;
1894 2533
1895 # abort map switching before logout 2534Moves the player to the given map-path and coordinates by first freezing
1896 if ($pl->ob->{_link_pos}) { 2535her, loading and preparing them map, calling the provided $check callback
1897 cf::sync_job { 2536that has to return the map if sucecssful, and then unfreezes the player on
1898 $pl->ob->leave_link 2537the new (success) or old (failed) map position. In either case, $done will
1899 }; 2538be called at the end of this process.
1900 }
1901 },
1902 on_login => sub {
1903 my ($pl) = @_;
1904 2539
1905 # try to abort aborted map switching on player login :)
1906 # should happen only on crashes
1907 if ($pl->ob->{_link_pos}) {
1908 $pl->ob->enter_link;
1909 (async {
1910 $pl->ob->reply (undef,
1911 "There was an internal problem at your last logout, "
1912 . "the server will try to bring you to your intended destination in a second.",
1913 cf::NDI_RED);
1914 # we need this sleep as the login has a concurrent enter_exit running
1915 # and this sleep increases chances of the player not ending up in scorn
1916 Coro::Timer::sleep 1;
1917 $pl->ob->leave_link;
1918 })->prio (2);
1919 }
1920 },
1921);
1922
1923=item $player_object->goto ($path, $x, $y)
1924
1925=cut 2540=cut
2541
2542our $GOTOGEN;
1926 2543
1927sub cf::object::player::goto { 2544sub cf::object::player::goto {
1928 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;
1929 2549
1930 $self->enter_link; 2550 $self->enter_link;
1931 2551
1932 (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
1933 my $map = eval { 2574 my $map = eval {
1934 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2576
2577 if ($map) {
1935 $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
1936 $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 $@;
1937 } or 2590 }
1938 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1939 2591
2592 if ($gen == $self->{_goto_generation}) {
2593 delete $self->{_goto_generation};
1940 $self->leave_link ($map, $x, $y); 2594 $self->leave_link ($map, $x, $y);
2595 }
2596
2597 $done->() if $done;
1941 })->prio (1); 2598 })->prio (1);
1942} 2599}
1943 2600
1944=item $player_object->enter_exit ($exit_object) 2601=item $player_object->enter_exit ($exit_object)
1945 2602
… …
1982 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
1983 } 2640 }
1984 2641
1985 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
1986 2643
1987 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
1988 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
1989 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
1990 2647
1991 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1992 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
1993 undef $fh; 2650 undef $fh;
1994 aio_rename "$meta~", $meta; 2651 aio_rename "$meta~", $meta;
… …
2014 my $hp = $exit->stats->hp; 2671 my $hp = $exit->stats->hp;
2015 my $sp = $exit->stats->sp; 2672 my $sp = $exit->stats->sp;
2016 2673
2017 $self->enter_link; 2674 $self->enter_link;
2018 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
2019 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2020 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2021 unless (eval { 2684 unless (eval {
2022 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2023 2686
2024 1; 2687 1;
… …
2050 2713
2051 utf8::encode $text; 2714 utf8::encode $text;
2052 $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);
2053} 2716}
2054 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
2055=item $client->ext_event ($type, %msg) 2842=item $client->ext_msg ($type, @msg)
2056 2843
2057Sends an exti event to the client. 2844Sends an ext event to the client.
2058 2845
2059=cut 2846=cut
2060 2847
2061sub cf::client::ext_event($$%) { 2848sub cf::client::ext_msg($$@) {
2062 my ($self, $type, %msg) = @_; 2849 my ($self, $type, @msg) = @_;
2063 2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove
2064 $msg{msgtype} = "event_$type"; 2854 push @msg, msgtype => "event_$type";
2065 $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 }
2066} 2875}
2067 2876
2068=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2069 2878
2070Queues a query to the client, calling the given callback with 2879Queues a query to the client, calling the given callback with
2071the 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>,
2072C<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>.
2073 2882
2074Queries 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
2075reliable at some point in the future. 2884become reliable at some point in the future.
2076 2885
2077=cut 2886=cut
2078 2887
2079sub cf::client::query { 2888sub cf::client::query {
2080 my ($self, $flags, $text, $cb) = @_; 2889 my ($self, $flags, $text, $cb) = @_;
… …
2088 utf8::encode $text; 2897 utf8::encode $text;
2089 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2898 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2090 2899
2091 $self->send_packet ($self->{query_queue}[0][0]) 2900 $self->send_packet ($self->{query_queue}[0][0])
2092 if @{ $self->{query_queue} } == 1; 2901 if @{ $self->{query_queue} } == 1;
2902
2903 1
2093} 2904}
2094 2905
2095cf::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 },
2096 on_reply => sub { 2912 on_reply => sub {
2097 my ($ns, $msg) = @_; 2913 my ($ns, $msg) = @_;
2098 2914
2099 # this weird shuffling is so that direct followup queries 2915 # this weird shuffling is so that direct followup queries
2100 # get handled first 2916 # get handled first
… …
2112 } else { 2928 } else {
2113 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2929 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2114 } 2930 }
2115 } 2931 }
2116 }, 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 },
2117); 2959);
2118 2960
2119=item $client->async (\&cb) 2961=item $client->async (\&cb)
2120 2962
2121Create a new coroutine, running the specified callback. The coroutine will 2963Create a new coroutine, running the specified callback. The coroutine will
… …
2162our $safe = new Safe "safe"; 3004our $safe = new Safe "safe";
2163our $safe_hole = new Safe::Hole; 3005our $safe_hole = new Safe::Hole;
2164 3006
2165$SIG{FPE} = 'IGNORE'; 3007$SIG{FPE} = 'IGNORE';
2166 3008
2167$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));
2168 3014
2169# here we export the classes and methods available to script code 3015# here we export the classes and methods available to script code
2170 3016
2171=pod 3017=pod
2172 3018
2173The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2174 3020
2175 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
2176 cf::object::player player 3025 cf::object::player
2177 cf::player peaceful 3026 player
2178 cf::map trigger 3027
3028 cf::player
3029 peaceful
3030
3031 cf::map
3032 trigger
2179 3033
2180=cut 3034=cut
2181 3035
2182for ( 3036for (
2183 ["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)],
2184 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2185 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2186 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2187) { 3043) {
2188 no strict 'refs'; 3044 no strict 'refs';
… …
2259=back 3115=back
2260 3116
2261=cut 3117=cut
2262 3118
2263############################################################################# 3119#############################################################################
2264
2265=head2 EXTENSION DATABASE SUPPORT
2266
2267Crossfire maintains a very simple database for extension use. It can
2268currently store anything that can be serialised using Storable, which
2269excludes objects.
2270
2271The parameter C<$family> should best start with the name of the extension
2272using it, it should be unique.
2273
2274=over 4
2275
2276=item $value = cf::db_get $family => $key
2277
2278Returns a single value from the database.
2279
2280=item cf::db_put $family => $key => $value
2281
2282Stores the given C<$value> in the family.
2283
2284=cut
2285
2286our $DB;
2287
2288sub db_init {
2289 unless ($DB) {
2290 $DB = BDB::db_create $DB_ENV;
2291
2292 cf::sync_job {
2293 eval {
2294 $DB->set_flags (BDB::CHKSUM);
2295
2296 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2297 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2298 cf::cleanup "db_open(db): $!" if $!;
2299 };
2300 cf::cleanup "db_open(db): $@" if $@;
2301 };
2302
2303 my $path = cf::localdir . "/database.pst";
2304 if (stat $path) {
2305 cf::sync_job {
2306 my $pst = Storable::retrieve $path;
2307
2308 cf::db_put (board => data => $pst->{board});
2309 cf::db_put (guildrules => data => $pst->{guildrules});
2310 cf::db_put (rent => balance => $pst->{rent}{balance});
2311 BDB::db_env_txn_checkpoint $DB_ENV;
2312
2313 unlink $path;
2314 };
2315 }
2316 }
2317}
2318
2319sub db_get($$) {
2320 my $key = "$_[0]/$_[1]";
2321
2322 cf::sync_job {
2323 BDB::db_get $DB, undef, $key, my $data;
2324
2325 $! ? ()
2326 : Compress::LZF::sthaw $data
2327 }
2328}
2329
2330sub db_put($$$) {
2331 BDB::dbreq_pri 4;
2332 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2333}
2334
2335#############################################################################
2336# the server's init and main functions 3120# the server's init and main functions
2337 3121
2338sub load_facedata { 3122sub load_facedata($) {
2339 my $path = sprintf "%s/facedata", cf::datadir; 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;
2340 3130
2341 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2342 3132
2343 my $facedata; 3133 my $facedata;
2344 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
… …
2347 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2348 3138
2349 $facedata->{version} == 2 3139 $facedata->{version} == 2
2350 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
2351 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
2352 { 3149 {
2353 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2354 3151
2355 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2356 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3154 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap};
2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2360 Coro::cede; 3158
3159 cf::cede_to_tick;
2361 } 3160 }
2362 3161
2363 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2364 next unless $info->{smooth}; 3163 next unless $info->{smooth};
2365 my $idx = cf::face::find $face 3164 my $idx = cf::face::find $face
2366 or next; 3165 or next;
2367 if (my $smooth = cf::face::find $info->{smooth}) { 3166 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth;
2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2369 } else { 3169 } else {
2370 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3170 warn "smooth face '$info->{smooth}' not found for face '$face'";
2371 } 3171 }
2372 Coro::cede; 3172
3173 cf::cede_to_tick;
2373 } 3174 }
2374 } 3175 }
2375 3176
2376 { 3177 {
2377 my $anims = $facedata->{animinfo}; 3178 my $anims = $facedata->{animinfo};
2378 3179
2379 while (my ($anim, $info) = each %$anims) { 3180 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3181 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede; 3182 cf::cede_to_tick;
2382 } 3183 }
2383 3184
2384 cf::anim::invalidate_all; # d'oh 3185 cf::anim::invalidate_all; # d'oh
2385 } 3186 }
2386 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
2387 1 3237 1
2388} 3238}
2389 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
3262sub reload_facedata {
3263 load_facedata "$DATADIR/facedata"
3264 or die "unable to load facedata\n";
3265}
3266
3267sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes"
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";
3275}
3276
3277sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n";
3280}
3281
2390sub reload_resources { 3282sub reload_resources {
2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3283 warn "reloading resource files...\n";
2392 or die "unable to load regions file\n";#d# 3284
3285 reload_regions;
2393 load_facedata 3286 reload_facedata;
2394 or die "unable to load facedata\n";#d# 3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures;
3290
3291 warn "finished reloading resource files\n";
2395} 3292}
2396 3293
2397sub init { 3294sub init {
2398 reload_resources; 3295 reload_resources;
2399} 3296}
2400 3297
2401sub cfg_load { 3298sub reload_config {
2402 open my $fh, "<:utf8", cf::confdir . "/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
2403 or return; 3300 or return;
2404 3301
2405 local $/; 3302 local $/;
2406 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
2407 3304
… …
2422sub main { 3319sub main {
2423 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
2424 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
2425 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#
2426 (async { 3323 (async {
2427 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
2428 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
2429 }; 3327 };
2430 3328
2431 cfg_load; 3329 reload_config;
2432 db_init; 3330 db_init;
2433 load_extensions; 3331 load_extensions;
2434 3332
2435 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2436 Event::loop; 3335 EV::loop;
2437} 3336}
2438 3337
2439############################################################################# 3338#############################################################################
2440# initialisation and cleanup 3339# initialisation and cleanup
2441 3340
2442# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
2443BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
2444 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
2445 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2446 reentrant => 0,
2447 data => WF_AUTOCANCEL,
2448 signal => $signal,
2449 prio => 0,
2450 cb => sub {
2451 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
2452 },
2453 ); 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
2454 } 3386 1
2455} 3387}
2456 3388
2457sub emergency_save() { 3389sub emergency_save() {
2458 my $freeze_guard = cf::freeze_mainloop; 3390 my $freeze_guard = cf::freeze_mainloop;
2459 3391
… …
2465 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
2466 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
2467 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
2468 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
2469 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2470 $pl->save; 3403 $pl->save;
2471 } 3404 }
2472 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
2473 3406
2474 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
… …
2492 3425
2493 warn Carp::longmess "post_cleanup backtrace" 3426 warn Carp::longmess "post_cleanup backtrace"
2494 if $make_core; 3427 if $make_core;
2495} 3428}
2496 3429
2497sub reload() { 3430sub do_reload_perl() {
2498 # can/must only be called in main 3431 # can/must only be called in main
2499 if ($Coro::current != $Coro::main) { 3432 if ($Coro::current != $Coro::main) {
2500 warn "can only reload from main coroutine"; 3433 warn "can only reload from main coroutine";
2501 return; 3434 return;
2502 } 3435 }
… …
2513 warn "syncing database to disk"; 3446 warn "syncing database to disk";
2514 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
2515 3448
2516 # 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
2517 3450
2518 warn "cancelling all WF_AUTOCANCEL watchers";
2519 for (Event::all_watchers) {
2520 $_->cancel if $_->data & WF_AUTOCANCEL;
2521 }
2522
2523 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
2524 for (;;) { 3452 for (;;) {
2525 BDB::flush; 3453 BDB::flush;
2526 IO::AIO::flush; 3454 IO::AIO::flush;
2527 Coro::cede; 3455 Coro::cede_notself;
2528 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
2529 warn "iterate..."; 3457 warn "iterate...";
2530 } 3458 }
2531 3459
2532 ++$RELOAD; 3460 ++$RELOAD;
… …
2536 %EXT_CORO = (); 3464 %EXT_CORO = ();
2537 3465
2538 warn "removing commands"; 3466 warn "removing commands";
2539 %COMMAND = (); 3467 %COMMAND = ();
2540 3468
2541 warn "removing ext commands"; 3469 warn "removing ext/exti commands";
2542 %EXTCMD = (); 3470 %EXTCMD = ();
3471 %EXTICMD = ();
2543 3472
2544 warn "unloading/nuking all extensions"; 3473 warn "unloading/nuking all extensions";
2545 for my $pkg (@EXTS) { 3474 for my $pkg (@EXTS) {
2546 warn "... unloading $pkg"; 3475 warn "... unloading $pkg";
2547 3476
… …
2577 Symbol::delete_package "safe::$_" 3506 Symbol::delete_package "safe::$_"
2578 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);
2579 3508
2580 warn "unloading cf.pm \"a bit\""; 3509 warn "unloading cf.pm \"a bit\"";
2581 delete $INC{"cf.pm"}; 3510 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"};
2582 3512
2583 # don't, removes xs symbols, too, 3513 # don't, removes xs symbols, too,
2584 # and global variables created in xs 3514 # and global variables created in xs
2585 #Symbol::delete_package __PACKAGE__; 3515 #Symbol::delete_package __PACKAGE__;
2586 3516
… …
2589 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
2590 require cf; 3520 require cf;
2591 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2592 3522
2593 warn "loading config and database again"; 3523 warn "loading config and database again";
2594 cf::cfg_load; 3524 cf::reload_config;
2595 3525
2596 warn "loading extensions"; 3526 warn "loading extensions";
2597 cf::load_extensions; 3527 cf::load_extensions;
2598 3528
2599 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
… …
2601 warn "reattaching attachments to maps"; 3531 warn "reattaching attachments to maps";
2602 reattach $_ for values %MAP; 3532 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players"; 3533 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER; 3534 reattach $_ for values %PLAYER;
2605 3535
2606 warn "loading reloadable resources";
2607 reload_resources;
2608
2609 warn "leaving sync_job"; 3536 warn "leaving sync_job";
2610 3537
2611 1 3538 1
2612 } or do { 3539 } or do {
2613 warn $@; 3540 warn $@;
… …
2618 warn "reloaded"; 3545 warn "reloaded";
2619}; 3546};
2620 3547
2621our $RELOAD_WATCHER; # used only during reload 3548our $RELOAD_WATCHER; # used only during reload
2622 3549
3550sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here.
3553
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3555 undef $RELOAD_WATCHER;
3556 do_reload_perl;
3557 };
3558}
3559
2623register_command "reload" => sub { 3560register_command "reload" => sub {
2624 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2625 3562
2626 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2627 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
2628 3565 async {
2629 # doing reload synchronously and two reloads happen back-to-back, 3566 $Coro::current->{desc} = "perl_reload";
2630 # coro crashes during coro_state_free->destroy here.
2631
2632 $RELOAD_WATCHER ||= Event->timer (
2633 reentrant => 0,
2634 after => 0,
2635 data => WF_AUTOCANCEL,
2636 cb => sub {
2637 reload; 3567 reload_perl;
2638 undef $RELOAD_WATCHER;
2639 },
2640 ); 3568 };
2641 } 3569 }
2642}; 3570};
2643 3571
2644unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2645 3573
2646my $bug_warning = 0; 3574my $bug_warning = 0;
2647 3575
2648$TICK_WATCHER = Event->timer ( 3576our @WAIT_FOR_TICK;
2649 reentrant => 0, 3577our @WAIT_FOR_TICK_BEGIN;
2650 parked => 1, 3578
2651 prio => 0, 3579sub wait_for_tick {
2652 at => $NEXT_TICK || $TICK, 3580 return unless $TICK_WATCHER->is_active;
2653 data => WF_AUTOCANCEL, 3581 return if $Coro::current == $Coro::main;
2654 cb => sub { 3582
3583 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait;
3586}
3587
3588sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main;
3591
3592 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait;
3595}
3596
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2655 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
2656 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"
2657 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
2658 return; 3601 return;
2659 } 3602 }
2660 3603
2661 $NOW = Event::time; 3604 $NOW = $tick_start = EV::now;
2662 3605
2663 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3607
2664 $RUNTIME += $TICK; 3608 $RUNTIME += $TICK;
2665 $NEXT_TICK += $TICK; 3609 $NEXT_TICK += $TICK;
2666 3610
2667 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2668 $NEXT_RUNTIME_WRITE = $NOW + 10; 3612 $NEXT_RUNTIME_WRITE = $NOW + 10;
2669 Coro::async_pool { 3613 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver";
2670 write_runtime 3615 write_runtime
2671 or warn "ERROR: unable to write runtime file: $!"; 3616 or warn "ERROR: unable to write runtime file: $!";
2672 };
2673 } 3617 };
2674
2675 $WAIT_FOR_TICK->broadcast;
2676 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2677
2678# my $AFTER = Event::time;
2679# warn $AFTER - $NOW;#d#
2680
2681 # if we are delayed by four ticks or more, skip them all
2682 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2683
2684 $TICK_WATCHER->at ($NEXT_TICK);
2685 $TICK_WATCHER->start;
2686 }, 3618 }
2687); 3619
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 $sig->send;
3622 }
3623 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send;
3625 }
3626
3627 $LOAD = ($NOW - $tick_start) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629
3630 _post_tick;
3631};
3632$TICK_WATCHER->priority (EV::MAXPRI);
2688 3633
2689{ 3634{
2690 BDB::max_poll_time $TICK * 0.1;
2691 $BDB_POLL_WATCHER = Event->io (
2692 reentrant => 0,
2693 fd => BDB::poll_fileno,
2694 poll => 'r',
2695 prio => 0,
2696 data => WF_AUTOCANCEL,
2697 cb => \&BDB::poll_cb,
2698 );
2699 BDB::min_parallel 8; 3635 BDB::min_parallel 8;
2700 3636 BDB::max_poll_reqs $TICK * 0.1;
2701 BDB::set_sync_prepare {
2702 my $status;
2703 my $current = $Coro::current;
2704 (
2705 sub {
2706 $status = $!;
2707 $current->ready; undef $current;
2708 },
2709 sub {
2710 Coro::schedule while defined $current;
2711 $! = $status;
2712 },
2713 )
2714 };
2715 3637
2716 unless ($DB_ENV) { 3638 unless ($DB_ENV) {
2717 $DB_ENV = BDB::db_env_create; 3639 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3641 | BDB::LOG_AUTOREMOVE, 1);
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2718 3644
2719 cf::sync_job { 3645 cf::sync_job {
2720 eval { 3646 eval {
2721 BDB::db_env_open 3647 BDB::db_env_open
2722 $DB_ENV, 3648 $DB_ENV,
2723 $BDB_ENV_DIR, 3649 $BDBDIR,
2724 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3650 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2725 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3651 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2726 0666; 3652 0666;
2727 3653
2728 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3654 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2729
2730 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2731 $DB_ENV->set_lk_detect;
2732 }; 3655 };
2733 3656
2734 cf::cleanup "db_env_open(db): $@" if $@; 3657 cf::cleanup "db_env_open(db): $@" if $@;
2735 }; 3658 };
2736 } 3659 }
3660
3661 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 };
3664 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3665 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3666 };
3667 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 };
2737} 3670}
2738 3671
2739{ 3672{
2740 IO::AIO::min_parallel 8; 3673 IO::AIO::min_parallel 8;
2741 3674
2742 undef $Coro::AIO::WATCHER; 3675 undef $Coro::AIO::WATCHER;
2743 IO::AIO::max_poll_time $TICK * 0.1; 3676 IO::AIO::max_poll_time $TICK * 0.1;
2744 $AIO_POLL_WATCHER = Event->io ( 3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
2745 reentrant => 0,
2746 data => WF_AUTOCANCEL,
2747 fd => IO::AIO::poll_fileno,
2748 poll => 'r',
2749 prio => 6,
2750 cb => \&IO::AIO::poll_cb,
2751 );
2752} 3678}
3679
3680my $_log_backtrace;
3681
3682sub _log_backtrace {
3683 my ($msg, @addr) = @_;
3684
3685 $msg =~ s/\n//;
3686
3687 # limit the # of concurrent backtraces
3688 if ($_log_backtrace < 2) {
3689 ++$_log_backtrace;
3690 async {
3691 $Coro::current->{desc} = "abt $msg";
3692
3693 my @bt = fork_call {
3694 @addr = map { sprintf "%x", $_ } @addr;
3695 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3696 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3697 or die "addr2line: $!";
3698
3699 my @funcs;
3700 my @res = <$fh>;
3701 chomp for @res;
3702 while (@res) {
3703 my ($func, $line) = splice @res, 0, 2, ();
3704 push @funcs, "[$func] $line";
3705 }
3706
3707 @funcs
3708 };
3709
3710 LOG llevInfo, "[ABT] $msg\n";
3711 LOG llevInfo, "[ABT] $_\n" for @bt;
3712 --$_log_backtrace;
3713 };
3714 } else {
3715 LOG llevInfo, "[ABT] $msg\n";
3716 LOG llevInfo, "[ABT] [suppressed]\n";
3717 }
3718}
3719
3720# load additional modules
3721use cf::pod;
2753 3722
2754END { cf::emergency_save } 3723END { cf::emergency_save }
2755 3724
27561 37251
2757 3726

Diff Legend

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