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

Diff Legend

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