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

Diff Legend

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