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

Diff Legend

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