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.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
34 64
35# configure various modules to our taste 65# configure various modules to our taste
36# 66#
37$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40 75
41$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
42 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
73 118
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 121our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
81 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
84 130
85our %CFG; 131our %CFG;
86 132
87our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 134our $RUNTIME;
135our $NOW;
89 136
90our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
93 140
94# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 143
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
100 153
101binmode STDOUT; 154binmode STDOUT;
102binmode STDERR; 155binmode STDERR;
103 156
104# read virtual server time, if available 157# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
109} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
110 165
111mkdir $_ 166mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 168
114our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
115 170
116sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
117 187
118############################################################################# 188#############################################################################
119 189
120=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
121 191
157 227
158The raw value load value from the last tick. 228The raw value load value from the last tick.
159 229
160=item %cf::CFG 230=item %cf::CFG
161 231
162Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 233from wherever your confdir points to.
164 234
165=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
166 236
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
246=item @cf::INVOKE_RESULTS
247
248This array contains the results of the last C<invoke ()> call. When
249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
250that call.
251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
171=back 258=back
172 259
173=cut 260=cut
174 261
175BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
176 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
177 my $msg = join "", @_; 269 my $msg = join "", @_;
178 270
179 $msg .= "\n" 271 $msg .= "\n"
180 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
181 273
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 275
184 utf8::encode $msg;
185 LOG llevError, $msg; 276 LOG llevWarn, $msg;
186 }; 277};
187} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
188 292
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 303for my $pkg (qw(
200 cf::global cf::attachable 304 cf::global cf::attachable
201 cf::object cf::object::player 305 cf::object cf::object::player
202 cf::client cf::player 306 cf::client cf::player
203 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
204 cf::map cf::party cf::region 309 cf::party cf::region
205)) { 310)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 312}
209 313
210$Event::DIED = sub { 314$EV::DIED = sub {
211 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
212}; 316};
213 317
214############################################################################# 318#############################################################################
215 319
216=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 343 $d
240 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
241} 345}
242 346
243=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
244 348
245Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
246 350
247=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
248 352
249Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
250 354
251=cut 355=cut
252 356
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 358
255sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
257 387
258=item cf::lock_wait $string 388=item cf::lock_wait $string
259 389
260Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
261 391
262=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
263 393
264Wait until the given lock is available and then acquires it and returns 394Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
267returned. 397returned.
268 398
399Locks are *not* recursive, locking from the same coro twice results in a
400deadlocked coro.
401
269Lock names should begin with a unique identifier (for example, cf::map::find 402Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 403uses map_find and cf::map::load uses map_load).
271 404
272=item $locked = cf::lock_active $string 405=item $locked = cf::lock_active $string
273 406
274Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
275 408
276=cut 409=cut
277 410
278our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
279 412
280sub lock_wait($) { 413sub lock_wait($) {
281 my ($key) = @_; 414 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 415}
289 416
290sub lock_acquire($) { 417sub lock_acquire($) {
291 my ($key) = @_; 418 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 419}
303 420
304sub lock_active($) { 421sub lock_active($) {
305 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 423}
309 424
310sub freeze_mainloop { 425sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 426 tick_inhibit_inc;
312 427
313 my $guard = Coro::guard { 428 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 429}
430
431=item cf::periodic $interval, $cb
432
433Like EV::periodic, but randomly selects a starting point so that the actions
434get spread over time.
435
436=cut
437
438sub periodic($$) {
439 my ($interval, $cb) = @_;
440
441 my $start = rand List::Util::min 180, $interval;
442
443 EV::periodic $start, $interval, 0, $cb
444}
445
446=item cf::get_slot $time[, $priority[, $name]]
447
448Allocate $time seconds of blocking CPU time at priority C<$priority>:
449This call blocks and returns only when you have at least C<$time> seconds
450of cpu time till the next tick. The slot is only valid till the next cede.
451
452The optional C<$name> can be used to identify the job to run. It might be
453used for statistical purposes and should identify the same time-class.
454
455Useful for short background jobs.
456
457=cut
458
459our @SLOT_QUEUE;
460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
462
463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
464$SLOT_QUEUE = Coro::async {
465 $Coro::current->desc ("timeslot manager");
466
467 my $signal = new Coro::Signal;
468 my $busy;
469
470 while () {
471 next_job:
472
473 my $avail = cf::till_tick;
474
475 for (0 .. $#SLOT_QUEUE) {
476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
478 my $job = splice @SLOT_QUEUE, $_, 1, ();
479 $job->[2]->send;
480 Coro::cede;
481 goto next_job;
482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
484 }
485 }
486
487 if (@SLOT_QUEUE) {
488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
489 push @cf::WAIT_FOR_TICK, $signal;
490 $signal->wait;
491 } else {
492 $busy = 0;
493 Coro::schedule;
494 }
315 }; 495 }
316 $TICK_WATCHER->stop; 496};
317 $guard 497
498sub get_slot($;$$) {
499 return if tick_inhibit || $Coro::current == $Coro::main;
500
501 my ($time, $pri, $name) = @_;
502
503 $time = clamp $time, 0.01, $TICK * .6;
504
505 my $sig = new Coro::Signal;
506
507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
509 $SLOT_QUEUE->ready;
510 $sig->wait;
318} 511}
319 512
320=item cf::async { BLOCK } 513=item cf::async { BLOCK }
321 514
322Currently the same as Coro::async_pool, meaning you cannot use 515Currently the same as Coro::async_pool, meaning you cannot use
327 520
328BEGIN { *async = \&Coro::async_pool } 521BEGIN { *async = \&Coro::async_pool }
329 522
330=item cf::sync_job { BLOCK } 523=item cf::sync_job { BLOCK }
331 524
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 525The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 526is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 527partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 528acceptable.
336 529
337If it must be done, put the blocking parts into C<sync_job>. This will run 530If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 531the given BLOCK in another coroutine while waiting for the result. The
342=cut 535=cut
343 536
344sub sync_job(&) { 537sub sync_job(&) {
345 my ($job) = @_; 538 my ($job) = @_;
346 539
347 if ($Coro::current == $Coro::main) { 540 if (in_main) {
348 my $time = Event::time; 541 my $time = AE::time;
349 542
350 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
352 545
353 # TODO: use suspend/resume instead 546 #LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 547
355 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
356 549
357 my $busy = 1; 550 my $busy = 1;
358 my @res; 551 my @res;
359 552
360 (async { 553 (async {
554 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 555 @res = eval { $job->() };
362 warn $@ if $@; 556 error $@ if $@;
363 undef $busy; 557 undef $busy;
364 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
365 559
366 while ($busy) { 560 while ($busy) {
367 Coro::cede or Event::one_event; 561 if (Coro::nready) {
562 Coro::cede_notself;
563 } else {
564 EV::loop EV::LOOP_ONESHOT;
368 } 565 }
566 }
369 567
370 $time = Event::time - $time; 568 my $time = AE::time - $time;
371 569
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
376 571
377 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
378 } else { 573 } else {
379 # we are in another coroutine, how wonderful, everything just works 574 # we are in another coroutine, how wonderful, everything just works
380 575
400 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
401 596
402 $coro 597 $coro
403} 598}
404 599
405=item fork_call { }, $args 600=item fork_call { }, @args
406 601
407Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 605never block itself or use any form of event handling.
411 606
412=cut 607=cut
608
609sub post_fork {
610 reset_signals;
611}
413 612
414sub fork_call(&@) { 613sub fork_call(&@) {
415 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
416 615
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 616 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 617 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 618 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 619
422 if (my $pid = fork) { 620 my @res = Coro::Util::fork_eval {
423 close $fh2; 621 cf::post_fork;
622 &$cb
623 } @args;
424 624
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 625 wantarray ? @res : $res[-1]
426 $res = Coro::Storable::thaw $res; 626}
427 627
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 628sub objinfo {
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals;
435 local $SIG{__WARN__};
436 local $SIG{__DIE__};
437 eval {
438 close $fh1;
439
440 my @res = eval { $cb->(@args) };
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 } 629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
637}
638
639=item $coin = coin_from_name $name
640
641=cut
642
643our %coin_alias = (
644 "silver" => "silvercoin",
645 "silvercoin" => "silvercoin",
646 "silvercoins" => "silvercoin",
647 "gold" => "goldcoin",
648 "goldcoin" => "goldcoin",
649 "goldcoins" => "goldcoin",
650 "platinum" => "platinacoin",
651 "platinumcoin" => "platinacoin",
652 "platinumcoins" => "platinacoin",
653 "platina" => "platinacoin",
654 "platinacoin" => "platinacoin",
655 "platinacoins" => "platinacoin",
656 "royalty" => "royalty",
657 "royalties" => "royalty",
658);
659
660sub coin_from_name($) {
661 $coin_alias{$_[0]}
662 ? cf::arch::find $coin_alias{$_[0]}
663 : undef
447} 664}
448 665
449=item $value = cf::db_get $family => $key 666=item $value = cf::db_get $family => $key
450 667
451Returns a single value from the environment database. 668Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 670=item cf::db_put $family => $key => $value
454 671
455Stores the given C<$value> in the family. It can currently store binary 672Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 673data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 674
675=item $db = cf::db_table "name"
676
677Create and/or open a new database table. The string must not be "db" and must be unique
678within each server.
679
458=cut 680=cut
681
682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
686 my ($name) = @_;
687 my $db = BDB::db_create $DB_ENV;
688
689 eval {
690 $db->set_flags (BDB::CHKSUM);
691
692 utf8::encode $name;
693 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
694 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
695 cf::cleanup "db_open(db): $!" if $!;
696 };
697 cf::cleanup "db_open(db): $@" if $@;
698
699 $db
700}
459 701
460our $DB; 702our $DB;
461 703
462sub db_init { 704sub db_init {
463 unless ($DB) { 705 $DB ||= db_table "db";
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job {
467 eval {
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 }
477} 706}
478 707
479sub db_get($$) { 708sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
481 710
482 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
483 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
484 715
485 $! ? () 716 $! ? ()
486 : $data 717 : $data
487 }
488} 718}
489 719
490sub db_put($$$) { 720sub db_put($$$) {
491 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
492 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
531 if (1) { 761 if (1) {
532 $md5 = 762 $md5 =
533 join "\x00", 763 join "\x00",
534 $processversion, 764 $processversion,
535 map { 765 map {
536 Coro::cede; 766 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 767 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 768 } 0.. $#$src;
539 769
540 770
541 my $dbmd5 = db_get cache => "$id/md5"; 771 my $dbmd5 = db_get cache => "$id/md5";
548 778
549 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
550 my $data = $process->(\@data); 780 my $data = $process->(\@data);
551 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
552 782
553 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
554 784
555 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
556 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
557 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
558 788
568 798
569=cut 799=cut
570 800
571sub datalog($@) { 801sub datalog($@) {
572 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
573 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
574} 804}
575 805
576=back 806=back
577 807
578=cut 808=cut
579 809
580############################################################################# 810#############################################################################
581 811
582=head2 ATTACHABLE OBJECTS 812=head2 ATTACHABLE OBJECTS
583 813
584Many objects in crossfire are so-called attachable objects. That means you can 814Many objects in deliantra are so-called attachable objects. That means you can
585attach callbacks/event handlers (a collection of which is called an "attachment") 815attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 816to it. All such attachable objects support the following methods.
587 817
588In the following description, CLASS can be any of C<global>, C<object> 818In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 819C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 820Deliantra).
591 821
592=over 4 822=over 4
593 823
594=item $attachable->attach ($attachment, key => $value...) 824=item $attachable->attach ($attachment, key => $value...)
595 825
639=item cf::CLASS::attachment $name, ... 869=item cf::CLASS::attachment $name, ...
640 870
641Register an attachment by C<$name> through which attachable objects of the 871Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 872given CLASS can refer to this attachment.
643 873
644Some classes such as crossfire maps and objects can specify attachments 874Some classes such as deliantra maps and objects can specify attachments
645that are attached at load/instantiate time, thus the need for a name. 875that are attached at load/instantiate time, thus the need for a name.
646 876
647These calls expect any number of the following handler/hook descriptions: 877These calls expect any number of the following handler/hook descriptions:
648 878
649=over 4 879=over 4
773 1003
774 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
775 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
776 1006
777 } elsif (ref $type) { 1007 } elsif (ref $type) {
778 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
779 1009
780 } else { 1010 } else {
781 shift @arg; 1011 shift @arg;
782 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
783 } 1013 }
784 } 1014 }
785} 1015}
786 1016
787sub _object_attach { 1017sub _object_attach {
797 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
798 } 1028 }
799 1029
800 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
801 } else { 1031 } else {
802 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
803 } 1033 }
804 1034
805 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
806} 1036}
807 1037
847 "; 1077 ";
848 die if $@; 1078 die if $@;
849} 1079}
850 1080
851our $override; 1081our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1082our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 1083
854sub override { 1084sub override {
855 $override = 1; 1085 $override = 1;
856 @invoke_results = (); 1086 @INVOKE_RESULTS = (@_);
857} 1087}
858 1088
859sub do_invoke { 1089sub do_invoke {
860 my $event = shift; 1090 my $event = shift;
861 my $callbacks = shift; 1091 my $callbacks = shift;
862 1092
863 @invoke_results = (); 1093 @INVOKE_RESULTS = ();
864 1094
865 local $override; 1095 local $override;
866 1096
867 for (@$callbacks) { 1097 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
869 1099
870 if ($@) { 1100 if ($@) {
871 warn "$@";
872 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
873 override; 1102 override;
874 } 1103 }
875 1104
876 return 1 if $override; 1105 return 1 if $override;
877 } 1106 }
878 1107
879 0 1108 0
880} 1109}
881 1110
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1111=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1112
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1113=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1114
886Generate an object-specific event with the given arguments. 1115Generate an object-specific event with the given arguments.
887 1116
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1117This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1118removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1119results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1120
892=back 1121=back
893 1122
894=cut 1123=cut
895 1124
896############################################################################# 1125#############################################################################
897# object support 1126# object support
1127
1128sub _object_equal($$);
1129sub _object_equal($$) {
1130 my ($a, $b) = @_;
1131
1132 return 0 unless (ref $a) eq (ref $b);
1133
1134 if ("HASH" eq ref $a) {
1135 my @ka = keys %$a;
1136 my @kb = keys %$b;
1137
1138 return 0 if @ka != @kb;
1139
1140 for (0 .. $#ka) {
1141 return 0 unless $ka[$_] eq $kb[$_];
1142 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1143 }
1144
1145 } elsif ("ARRAY" eq ref $a) {
1146
1147 return 0 if @$a != @$b;
1148
1149 for (0 .. $#$a) {
1150 return 0 unless _object_equal $a->[$_], $b->[$_];
1151 }
1152
1153 } elsif ($a ne $b) {
1154 return 0;
1155 }
1156
1157 1
1158}
1159
1160our $SLOW_MERGES;#d#
1161sub _can_merge {
1162 my ($ob1, $ob2) = @_;
1163
1164 ++$SLOW_MERGES;#d#
1165
1166 # we do the slow way here
1167 return _object_equal $ob1, $ob2
1168}
898 1169
899sub reattach { 1170sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1171 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1172 my ($obj) = @_;
902 1173
1174 # no longer needed after getting rid of delete_package?
903 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1175 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
904 1176
905 my $registry = $obj->registry; 1177 my $registry = $obj->registry;
906 1178
907 @$registry = (); 1179 @$registry = ();
908 1180
913 for (@$attach) { 1185 for (@$attach) {
914 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
915 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
916 } 1188 }
917 } else { 1189 } else {
918 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
919 } 1191 }
920 } 1192 }
921} 1193}
922 1194
923cf::attachable->attach ( 1195cf::attachable->attach (
924 prio => -1000000, 1196 prio => -1000000,
925 on_instantiate => sub { 1197 on_instantiate => sub {
926 my ($obj, $data) = @_; 1198 my ($obj, $data) = @_;
927 1199
928 $data = from_json $data; 1200 $data = decode_json $data;
929 1201
930 for (@$data) { 1202 for (@$data) {
931 my ($name, $args) = @$_; 1203 my ($name, $args) = @$_;
932 1204
933 $obj->attach ($name, %{$args || {} }); 1205 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1221sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
951 1223
952 sync_job { 1224 sync_job {
953 if (length $$rdata) { 1225 if (length $$rdata) {
1226 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
956 1230
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1232 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1236 aio_fsync $fh;
1237 }
961 close $fh; 1238 aio_close $fh;
962 1239
963 if (@$objs) { 1240 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1242 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1247 aio_fsync $fh;
1248 }
969 close $fh; 1249 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
971 } 1251 }
972 } else { 1252 } else {
973 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
974 } 1254 }
975 1255
976 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1257
1258 $filename =~ s%/[^/]+$%%;
1259 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1260 } else {
978 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
979 } 1262 }
980 } else { 1263 } else {
981 aio_unlink $filename; 1264 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
983 } 1266 }
984 } 1267 };
985} 1268}
986 1269
987sub object_freezer_as_string { 1270sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1271 my ($rdata, $objs) = @_;
989 1272
1001 or return; 1284 or return;
1002 1285
1003 unless (aio_stat "$filename.pst") { 1286 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1287 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1288 or return;
1289
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1290 my $st = eval { Coro::Storable::thaw $av };
1291 $av = $st->{objs};
1007 } 1292 }
1008 1293
1294 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1298
1011 return ($data, $av); 1299 ($data, $av)
1012} 1300}
1013 1301
1014=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1015 1303
1016=over 4 1304=over 4
1070 my ($name, $cb) = @_; 1358 my ($name, $cb) = @_;
1071 1359
1072 $EXTICMD{$name} = $cb; 1360 $EXTICMD{$name} = $cb;
1073} 1361}
1074 1362
1363use File::Glob ();
1364
1075cf::player->attach ( 1365cf::player->attach (
1076 on_command => sub { 1366 on_unknown_command => sub {
1077 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1078 1368
1079 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1080 or return; 1370 or return;
1081 1371
1089 my ($pl, $buf) = @_; 1379 my ($pl, $buf) = @_;
1090 1380
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1381 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1382
1093 if (ref $msg) { 1383 if (ref $msg) {
1384 my ($type, $reply, @payload) =
1385 "ARRAY" eq ref $msg
1386 ? @$msg
1387 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1388
1389 my @reply;
1390
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1391 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1392 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1393 }
1394
1395 $pl->ext_reply ($reply, @reply)
1396 if $reply;
1397
1099 } else { 1398 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1400 }
1102 1401
1103 cf::override; 1402 cf::override;
1104 }, 1403 },
1105); 1404);
1106 1405
1406# "readahead" all extensions
1407sub cache_extensions {
1408 my $grp = IO::AIO::aio_group;
1409
1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1411 for (grep /\.ext$/, @{$_[0]}) {
1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1413 }
1414 };
1415
1416 $grp
1417}
1418
1107sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1108 cf::sync_job { 1422 cf::sync_job {
1109 my %todo; 1423 my %todo;
1110 1424
1111 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1112 next unless -r $path; 1426 next unless -r $path;
1130 1444
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1447
1134 $ext{source} = 1448 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1136 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1137 . $source 1451 . $source
1138 . "\n};\n1"; 1452 . "\n};\n1";
1139 1453
1140 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1141 } 1455 }
1142 1456
1457 my $pass = 0;
1143 my %done; 1458 my %done;
1144 while (%todo) { 1459 while (%todo) {
1145 my $progress; 1460 my $progress;
1146 1461
1462 ++$pass;
1463
1464 ext:
1147 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip 1467 next ext
1150 unless exists $done{$_}; 1468 unless exists $done{$_};
1151 } 1469 }
1152 1470
1153 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1154 1472
1155 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1156 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1157 : "$v->{base}: extension inactive.\n";
1158 1477
1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1159 if (exists $v->{meta}{mandatory}) { 1479 if exists $v->{meta}{mandatory};
1160 warn $msg; 1480
1161 warn "mandatory extension failed to load, exiting.\n"; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1162 exit 1; 1482 delete $todo{$k};
1163 } 1483 } else {
1164 1484 $done{$k} = delete $todo{$k};
1165 warn $msg; 1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1166 } 1490 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
1171 } 1491 }
1172 1492
1173 skip: 1493 unless ($progress) {
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1175 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1176 } 1501 }
1177 }; 1502 };
1178} 1503}
1179 1504
1180############################################################################# 1505#############################################################################
1181 1506
1182=back 1507=back
1183 1508
1184=head2 CORE EXTENSIONS 1509=head2 CORE EXTENSIONS
1185 1510
1186Functions and methods that extend core crossfire objects. 1511Functions and methods that extend core deliantra objects.
1187 1512
1188=cut 1513=cut
1189 1514
1190package cf::player; 1515package cf::player;
1191 1516
1192use Coro::AIO; 1517use Coro::AIO;
1193 1518
1194=head3 cf::player 1519=head3 cf::player
1195 1520
1196=over 4 1521=over 4
1522
1523=item cf::player::num_playing
1524
1525Returns the official number of playing players, as per the Crossfire metaserver rules.
1526
1527=cut
1528
1529sub num_playing {
1530 scalar grep
1531 $_->ob->map
1532 && !$_->hidden
1533 && !$_->ob->flag (cf::FLAG_WIZ),
1534 cf::player::list
1535}
1197 1536
1198=item cf::player::find $login 1537=item cf::player::find $login
1199 1538
1200Returns the given player object, loading it if necessary (might block). 1539Returns the given player object, loading it if necessary (might block).
1201 1540
1220 1559
1221sub exists($) { 1560sub exists($) {
1222 my ($login) = @_; 1561 my ($login) = @_;
1223 1562
1224 $cf::PLAYER{$login} 1563 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1564 or !aio_stat path $login
1226} 1565}
1227 1566
1228sub find($) { 1567sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1568 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1569 my $login = $_[0];
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1576 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1577 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1578 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1579 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1580
1242 my $pl = load_pl path $login 1581 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1582 or return;
1583
1584 my $pl = cf::player::load_pl $f
1585 or return;
1586
1587 local $cf::PLAYER_LOADING{$login} = $pl;
1588 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1245 } 1590 }
1246 } 1591 }
1247} 1592}
1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1248 1606
1249sub save($) { 1607sub save($) {
1250 my ($pl) = @_; 1608 my ($pl) = @_;
1251 1609
1252 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1257 return if $pl->{deny_save}; 1615 return if $pl->{deny_save};
1258 1616
1259 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1261 1619
1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1624
1262 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1263 Coro::cede; 1626 cf::cede_to_tick;
1264} 1627}
1265 1628
1266sub new($) { 1629sub new($) {
1267 my ($login) = @_; 1630 my ($login) = @_;
1268 1631
1274 $cf::PLAYER{$login} = $self; 1637 $cf::PLAYER{$login} = $self;
1275 1638
1276 $self 1639 $self
1277} 1640}
1278 1641
1642=item $player->send_msg ($channel, $msg, $color, [extra...])
1643
1644=cut
1645
1646sub send_msg {
1647 my $ns = shift->ns
1648 or return;
1649 $ns->send_msg (@_);
1650}
1651
1279=item $pl->quit_character 1652=item $pl->quit_character
1280 1653
1281Nukes the player without looking back. If logged in, the connection will 1654Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1655be destroyed. May block for a long time.
1283 1656
1287 my ($pl) = @_; 1660 my ($pl) = @_;
1288 1661
1289 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1290 1663
1291 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1293 1666
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1295 $pl->deactivate; 1668 $pl->deactivate;
1669
1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1297 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1298 1675
1299 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1301 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1336 or return []; 1713 or return [];
1337 1714
1338 my @logins; 1715 my @logins;
1339 1716
1340 for my $login (@$dirs) { 1717 for my $login (@$dirs) {
1718 my $path = path $login;
1719
1720 # a .pst is a dead give-away for a valid player
1721 # if no pst file found, open and chekc for blocked users
1722 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1723 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1724 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1725 $buf !~ /^password -------------$/m or next; # official not-valid tag
1726 }
1344 1727
1345 utf8::decode $login; 1728 utf8::decode $login;
1346 push @logins, $login; 1729 push @logins, $login;
1347 } 1730 }
1348 1731
1349 \@logins 1732 \@logins
1350} 1733}
1351 1734
1352=item $player->maps 1735=item $player->maps
1736
1737=item cf::player::maps $login
1353 1738
1354Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1355player. May block. 1740player. May block.
1356 1741
1357=cut 1742=cut
1375 } 1760 }
1376 1761
1377 \@paths 1762 \@paths
1378} 1763}
1379 1764
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1765=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1766
1382Expand crossfire pod fragments into protocol xml. 1767Expand deliantra pod fragments into protocol xml.
1383 1768
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1769=item $player->ext_reply ($msgid, @msg)
1414 1770
1415Sends an ext reply to the player. 1771Sends an ext reply to the player.
1416 1772
1417=cut 1773=cut
1418 1774
1419sub ext_reply($$%) { 1775sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1776 my ($self, $id, @msg) = @_;
1421 1777
1422 $msg{msgid} = $id; 1778 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1779}
1425 1780
1426=item $player->ext_event ($type, %msg) 1781=item $player->ext_msg ($type, @msg)
1427 1782
1428Sends an ext event to the client. 1783Sends an ext event to the client.
1429 1784
1430=cut 1785=cut
1431 1786
1432sub ext_event($$%) { 1787sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1788 my ($self, $type, @msg) = @_;
1434 1789
1435 $self->ns->ext_event ($type, %msg); 1790 $self->ns->ext_msg ($type, @msg);
1436} 1791}
1437 1792
1438=head3 cf::region 1793=head3 cf::region
1439 1794
1440=over 4 1795=over 4
1450=cut 1805=cut
1451 1806
1452sub find_by_path($) { 1807sub find_by_path($) {
1453 my ($path) = @_; 1808 my ($path) = @_;
1454 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1455 my ($match, $specificity); 1812 my ($match, $specificity);
1456 1813
1457 for my $region (list) { 1814 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1817 if $region->specificity > $specificity;
1461 } 1818 }
1462 } 1819 }
1463 1820
1484our $MAX_RESET = 3600; 1841our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1842our $DEFAULT_RESET = 3000;
1486 1843
1487sub generate_random_map { 1844sub generate_random_map {
1488 my ($self, $rmp) = @_; 1845 my ($self, $rmp) = @_;
1846
1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1848
1489 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1490 $self->_create_random_map ( 1850 $self->_create_random_map (
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1494 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1495 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1496 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1497 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1512 1872
1513sub register { 1873sub register {
1514 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1515 my $pkg = caller; 1875 my $pkg = caller;
1516 1876
1517 no strict;
1518 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1519 1878
1520 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1521} 1880}
1522 1881
1523# also paths starting with '/' 1882# also paths starting with '/'
1524$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1525 1884
1526sub thawer_merge { 1885sub thawer_merge {
1527 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1528 1887
1529 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1534} 1893}
1535 1894
1536sub normalise { 1895sub normalise {
1537 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1538 1897
1539 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1540 1899
1541 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1542 1901
1543 # map plan: 1902 # map plan:
1544 # 1903 #
1583 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1584 return $self; 1943 return $self;
1585 } 1944 }
1586 } 1945 }
1587 1946
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1589 () 1948 ()
1590} 1949}
1591 1950
1592sub init { 1951sub init {
1593 my ($self) = @_; 1952 my ($self) = @_;
1615 1974
1616# the temporary/swap location 1975# the temporary/swap location
1617sub save_path { 1976sub save_path {
1618 my ($self) = @_; 1977 my ($self) = @_;
1619 1978
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1979 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1980 "$TMPDIR/$path.map"
1622} 1981}
1623 1982
1624# the unique path, undef == no special unique path 1983# the unique path, undef == no special unique path
1625sub uniq_path { 1984sub uniq_path {
1626 my ($self) = @_; 1985 my ($self) = @_;
1627 1986
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1630}
1631
1632# and all this just because we cannot iterate over
1633# all maps in C++...
1634sub change_all_map_light {
1635 my ($change) = @_;
1636
1637 $_->change_map_light ($change)
1638 for grep $_->outdoor, values %cf::MAP;
1639} 1989}
1640 1990
1641sub decay_objects { 1991sub decay_objects {
1642 my ($self) = @_; 1992 my ($self) = @_;
1643 1993
1656 2006
1657sub load_header_from($) { 2007sub load_header_from($) {
1658 my ($self, $path) = @_; 2008 my ($self, $path) = @_;
1659 2009
1660 utf8::encode $path; 2010 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 2011 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 or return; 2012 or return;
2013
2014 $self->_load_header ($f)
2015 or return;
2016
2017 local $MAP_LOADING{$self->{path}} = $self;
2018 $f->resolve_delayed_derefs;
1666 2019
1667 $self->{load_path} = $path; 2020 $self->{load_path} = $path;
1668 2021
1669 1 2022 1
1670} 2023}
1722 2075
1723sub find; 2076sub find;
1724sub find { 2077sub find {
1725 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1726 2079
2080 cf::cede_to_tick;
2081
1727 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1728 2083
2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1730 2086
1731 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
1732 my $guard = cf::lock_acquire "map_find:$path";
1733 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
1734 or return; 2089 or return;
1735 2090
1736 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
1737 2092
1739 or return; 2094 or return;
1740 2095
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2096 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 2097 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 2098 #$cf::WAIT_FOR_TICK->wait;
2099 undef $guard2;
2100 undef $guard1;
1744 $map->reset; 2101 $map->reset;
1745 undef $guard;
1746 return find $path; 2102 return find $path;
1747 } 2103 }
1748 2104
1749 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
1750 } 2106 }
1751} 2107}
1752 2108
1753sub pre_load { } 2109sub pre_load { }
1754sub post_load { } 2110#sub post_load { } # XS
1755 2111
1756sub load { 2112sub load {
1757 my ($self) = @_; 2113 my ($self) = @_;
1758 2114
1759 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
1760 2116
1761 my $path = $self->{path}; 2117 my $path = $self->{path};
1762 2118
1763 { 2119 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2120 my $guard = cf::lock_acquire "map_data:$path";
1765 2121
2122 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2123 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 2124
1768 $self->in_memory (cf::MAP_LOADING); 2125 $self->in_memory (cf::MAP_LOADING);
1769 2126
1770 $self->alloc; 2127 $self->alloc;
1771 2128
1772 $self->pre_load; 2129 $self->pre_load;
1773 Coro::cede; 2130 cf::cede_to_tick;
1774 2131
2132 my $f = new_from_file cf::object::thawer $self->{load_path};
2133 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2134 $self->_load_objects ($f)
1776 or return; 2135 or return;
1777 2136
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2137 $self->post_load_original
1779 if delete $self->{load_original}; 2138 if delete $self->{load_original};
1780 2139
1781 if (my $uniq = $self->uniq_path) { 2140 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2141 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2142 unless (aio_stat $uniq) {
2143 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2144 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2145 $self->_load_objects ($f);
2146 $f->resolve_delayed_derefs;
2147 }
1786 } 2148 }
1787 } 2149 }
1788 2150
1789 Coro::cede; 2151 $f->resolve_delayed_derefs;
2152
2153 cf::cede_to_tick;
1790 # now do the right thing for maps 2154 # now do the right thing for maps
1791 $self->link_multipart_objects; 2155 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2156 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2157 unless $self->difficulty;
1794 Coro::cede; 2158 cf::cede_to_tick;
1795 2159
1796 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2161 $self->decay_objects;
1798 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
1799 $self->update_buttons; 2163 $self->update_buttons;
1800 Coro::cede; 2164 cf::cede_to_tick;
1801 $self->set_darkness_map;
1802 Coro::cede;
1803 $self->activate; 2165 $self->activate;
1804 } 2166 }
1805 2167
2168 $self->{last_save} = $cf::RUNTIME;
2169 $self->last_access ($cf::RUNTIME);
2170
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2171 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2172 }
1808 2173
1809 $self->post_load; 2174 $self->post_load;
1810} 2175}
1811 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
1812sub customise_for { 2180sub customise_for {
1813 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
1814 2182
1815 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
1816 if $self->per_player; 2184 if $self->per_player;
1820 2188
1821 $self 2189 $self
1822} 2190}
1823 2191
1824# find and load all maps in the 3x3 area around a map 2192# find and load all maps in the 3x3 area around a map
1825sub load_diag { 2193sub load_neighbours {
1826 my ($map) = @_; 2194 my ($map) = @_;
1827 2195
1828 my @diag; # diagonal neighbours 2196 my @neigh; # diagonal neighbours
1829 2197
1830 for (0 .. 3) { 2198 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2199 my $neigh = $map->tile_path ($_)
1832 or next; 2200 or next;
1833 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
1834 or next; 2202 or next;
1835 $neigh->load; 2203 $neigh->load;
1836 2204
2205 # now find the diagonal neighbours
2206 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2209 }
1840 2210
1841 for (@diag) { 2211 for (grep defined $_->[0], @neigh) {
2212 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2213 my $neigh = find $path, $origin
1843 or next; 2214 or next;
1844 $neigh->load; 2215 $neigh->load;
1845 } 2216 }
1846} 2217}
1847 2218
1848sub find_sync { 2219sub find_sync {
1849 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
1850 2221
1851 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
1852} 2226}
1853 2227
1854sub do_load_sync { 2228sub do_load_sync {
1855 my ($map) = @_; 2229 my ($map) = @_;
1856 2230
1857 cf::sync_job { $map->load }; 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232 if $Coro::current == $Coro::main;
2233
2234 $map->load;
1858} 2235}
1859 2236
1860our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
1862 2239
1863sub find_async { 2240sub find_async {
1864 my ($path, $origin) = @_; 2241 my ($path, $origin, $load) = @_;
1865 2242
1866 $path = normalise $path, $origin && $origin->{path}; 2243 $path = normalise $path, $origin && $origin->{path};
1867 2244
1868 if (my $map = $cf::MAP{$path}) { 2245 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2246 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2247 }
1871 2248
1872 undef $MAP_PREFETCH{$path}; 2249 $MAP_PREFETCH{$path} |= $load;
2250
1873 $MAP_PREFETCHER ||= cf::async { 2251 $MAP_PREFETCHER ||= cf::async {
2252 $Coro::current->{desc} = "map prefetcher";
2253
1874 while (%MAP_PREFETCH) { 2254 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2255 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2256 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2257 $map->load if $v;
2258 }
1879 2259
1880 delete $MAP_PREFETCH{$path}; 2260 delete $MAP_PREFETCH{$k};
1881 } 2261 }
1882 } 2262 }
1883 undef $MAP_PREFETCHER; 2263 undef $MAP_PREFETCHER;
1884 }; 2264 };
1885 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
1886 2266
1887 () 2267 ()
1888} 2268}
1889 2269
2270# common code, used by both ->save and ->swapout
1890sub save { 2271sub _save {
1891 my ($self) = @_; 2272 my ($self) = @_;
1892
1893 my $lock = cf::lock_acquire "map_data:" . $self->path;
1894 2273
1895 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
1896 2275
1897 return unless $self->dirty; 2276 return unless $self->dirty;
1898 2277
1904 return if $self->{deny_save}; 2283 return if $self->{deny_save};
1905 2284
1906 local $self->{last_access} = $self->last_access;#d# 2285 local $self->{last_access} = $self->last_access;#d#
1907 2286
1908 cf::async { 2287 cf::async {
2288 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2289 $_->contr->save for $self->players;
1910 }; 2290 };
2291
2292 cf::get_slot 0.02;
1911 2293
1912 if ($uniq) { 2294 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2295 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2296 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2297 } else {
1916 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1917 } 2299 }
1918} 2300}
1919 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
1920sub swap_out { 2310sub swap_out {
1921 my ($self) = @_; 2311 my ($self) = @_;
1922 2312
1923 # save first because save cedes
1924 $self->save;
1925
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2314
2315 return if $self->in_memory != cf::MAP_ACTIVE;
2316 return if $self->{deny_save};
1928 return if $self->players; 2317 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save};
1931 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
1932 $self->clear; 2328 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2329}
1935 2330
1936sub reset_at { 2331sub reset_at {
1937 my ($self) = @_; 2332 my ($self) = @_;
1938 2333
1956 2351
1957 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
1958 2353
1959 return if $self->players; 2354 return if $self->players;
1960 2355
1961 warn "resetting map ", $self->path; 2356 cf::trace "resetting map ", $self->path, "\n";
1962 2357
1963 $self->in_memory (cf::MAP_SWAPPED); 2358 $self->in_memory (cf::MAP_SWAPPED);
1964 2359
1965 # need to save uniques path 2360 # need to save uniques path
1966 unless ($self->{deny_save}) { 2361 unless ($self->{deny_save}) {
1970 if $uniq; 2365 if $uniq;
1971 } 2366 }
1972 2367
1973 delete $cf::MAP{$self->path}; 2368 delete $cf::MAP{$self->path};
1974 2369
2370 $self->deactivate;
2371 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2372 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2373
1979 $self->unlink_save; 2374 $self->unlink_save;
1980 $self->destroy; 2375 $self->destroy;
1981} 2376}
1982 2377
1983my $nuke_counter = "aaaa"; 2378my $nuke_counter = "aaaa";
1984 2379
1985sub nuke { 2380sub nuke {
1986 my ($self) = @_; 2381 my ($self) = @_;
1987 2382
2383 {
2384 my $lock = cf::lock_acquire "map_data:$self->{path}";
2385
1988 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
1989 2387
1990 $self->unlink_save; 2388 $self->unlink_save;
1991 2389
1992 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
1993 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2395
1998 $cf::MAP{$self->path} = $self; 2396 $cf::MAP{$self->path} = $self;
2397 }
1999 2398
2000 $self->reset; # polite request, might not happen 2399 $self->reset; # polite request, might not happen
2001} 2400}
2002 2401
2003=item $maps = cf::map::tmp_maps 2402=item $maps = cf::map::tmp_maps
2045 2444
2046sub unique_maps() { 2445sub unique_maps() {
2047 [ 2446 [
2048 map { 2447 map {
2049 utf8::decode $_; 2448 utf8::decode $_;
2050 /\.map$/ 2449 s/\.map$//; # TODO future compatibility hack
2450 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2451 ? ()
2051 ? normalise $_ 2452 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2454 ]
2055} 2455}
2056 2456
2057package cf; 2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2058 2488
2059=back 2489=back
2060 2490
2061=head3 cf::object 2491=head3 cf::object
2062 2492
2066 2496
2067=over 4 2497=over 4
2068 2498
2069=item $ob->inv_recursive 2499=item $ob->inv_recursive
2070 2500
2071Returns the inventory of the object _and_ their inventories, recursively. 2501Returns the inventory of the object I<and> their inventories, recursively,
2502but I<not> the object itself.
2072 2503
2073=cut 2504=cut
2074 2505
2075sub inv_recursive_; 2506sub inv_recursive_;
2076sub inv_recursive_ { 2507sub inv_recursive_ {
2079 2510
2080sub inv_recursive { 2511sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2512 inv_recursive_ inv $_[0]
2082} 2513}
2083 2514
2515=item $ref = $ob->ref
2516
2517Creates and returns a persistent reference to an object that can be stored as a string.
2518
2519=item $ob = cf::object::deref ($refstring)
2520
2521returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2522even if the object actually exists. May block.
2523
2524=cut
2525
2526sub deref {
2527 my ($ref) = @_;
2528
2529 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2530 my ($uuid, $name) = ($1, $2);
2531 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2532 or return;
2533 $pl->ob->uuid eq $uuid
2534 or return;
2535
2536 $pl->ob
2537 } else {
2538 warn "$ref: cannot resolve object reference\n";
2539 undef
2540 }
2541}
2542
2084package cf; 2543package cf;
2085 2544
2086=back 2545=back
2087 2546
2088=head3 cf::object::player 2547=head3 cf::object::player
2094Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2553Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2095can be C<undef>. Does the right thing when the player is currently in a 2554can be C<undef>. Does the right thing when the player is currently in a
2096dialogue with the given NPC character. 2555dialogue with the given NPC character.
2097 2556
2098=cut 2557=cut
2558
2559our $SAY_CHANNEL = {
2560 id => "say",
2561 title => "Map",
2562 reply => "say ",
2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2564};
2565
2566our $CHAT_CHANNEL = {
2567 id => "chat",
2568 title => "Chat",
2569 reply => "chat ",
2570 tooltip => "Player chat and shouts, global to the server.",
2571};
2099 2572
2100# rough implementation of a future "reply" method that works 2573# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2574# with dialog boxes.
2102#TODO: the first argument must go, split into a $npc->reply_to ( method 2575#TODO: the first argument must go, split into a $npc->reply_to ( method
2103sub cf::object::player::reply($$$;$) { 2576sub cf::object::player::reply($$$;$) {
2110 2583
2111 } else { 2584 } else {
2112 my $pl = $self->contr; 2585 my $pl = $self->contr;
2113 2586
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2587 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2588 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2589 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2590
2123 } else { 2591 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2592 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2593 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2594 }
2127 } 2595 }
2596}
2597
2598=item $object->send_msg ($channel, $msg, $color, [extra...])
2599
2600=cut
2601
2602sub cf::object::send_msg {
2603 my $pl = shift->contr
2604 or return;
2605 $pl->send_msg (@_);
2128} 2606}
2129 2607
2130=item $player_object->may ("access") 2608=item $player_object->may ("access")
2131 2609
2132Returns wether the given player is authorized to access resource "access" 2610Returns wether the given player is authorized to access resource "access"
2145 2623
2146=item $player_object->enter_link 2624=item $player_object->enter_link
2147 2625
2148Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2149 2627
2150The player should be reasonably safe there for short amounts of time. You 2628The player should be reasonably safe there for short amounts of time (e.g.
2151I<MUST> call C<leave_link> as soon as possible, though. 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630though, as the player cannot control the character while it is on the link
2631map.
2152 2632
2153Will never block. 2633Will never block.
2154 2634
2155=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2156 2636
2176sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2177 my ($self) = @_; 2657 my ($self) = @_;
2178 2658
2179 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2180 2660
2661 ++$self->{_link_recursion};
2662
2181 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2182 2664
2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2184 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2185 2667
2186 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2187} 2669}
2188 2670
2189sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2190 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2191 2673
2208 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2209 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2210 2692
2211 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2214 2696
2215 $map->load; 2697 $map->load;
2216 $map->load_diag; 2698 $map->load_neighbours;
2217 2699
2218 return unless $self->contr->active; 2700 return unless $self->contr->active;
2219 $self->activate_recursive;
2220 2701
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2223} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2224 2709
2710}
2711
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2226 2713
2227Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2717the new (success) or old (failed) map position. In either case, $done will
2718be called at the end of this process.
2719
2720Note that $check will be called with a potentially non-loaded map, so if
2721it needs a loaded map it has to call C<< ->load >>.
2231 2722
2232=cut 2723=cut
2233 2724
2234our $GOTOGEN; 2725our $GOTOGEN;
2235 2726
2236sub cf::object::player::goto { 2727sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2238 2735
2239 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2738
2242 $self->enter_link; 2739 $self->enter_link;
2243 2740
2244 (async { 2741 (async {
2742 $Coro::current->{desc} = "player::goto $path $x $y";
2743
2744 # *tag paths override both path and x|y
2745 if ($path =~ /^\*(.*)$/) {
2746 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2747 my $ob = $obs[rand @obs];
2748
2749 # see if we actually can go there
2750 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2751 $ob = $obs[rand @obs];
2752 } else {
2753 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2754 }
2755 # else put us there anyways for now #d#
2756
2757 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2758 } else {
2759 ($path, $x, $y) = (undef, undef, undef);
2760 }
2761 }
2762
2245 my $map = eval { 2763 my $map = eval {
2246 my $map = cf::map::find $path; 2764 my $map = defined $path ? cf::map::find $path : undef;
2247 2765
2248 if ($map) { 2766 if ($map) {
2249 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2251 } else { 2769 } else {
2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2253 } 2771 }
2254 2772
2255 $map 2773 $map
2256 }; 2774 };
2257 2775
2262 2780
2263 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2266 } 2784 }
2785
2786 $done->($self) if $done;
2267 })->prio (1); 2787 })->prio (1);
2268} 2788}
2269 2789
2270=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2271 2791
2291} 2811}
2292 2812
2293sub prepare_random_map { 2813sub prepare_random_map {
2294 my ($exit) = @_; 2814 my ($exit) = @_;
2295 2815
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2816 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2817 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2818 # that depends on the exit object
2301 2819
2302 my $rmp = parse_random_map_params $exit->msg; 2820 my $rmp = parse_random_map_params $exit->msg;
2304 if ($exit->map) { 2822 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2823 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2824 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2825 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2826 $rmp->{origin_y} = $exit->y;
2827
2828 $exit->map->touch;
2309 } 2829 }
2310 2830
2311 $rmp->{random_seed} ||= $exit->random_seed; 2831 $rmp->{random_seed} ||= $exit->random_seed;
2312 2832
2313 my $data = cf::to_json $rmp; 2833 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2834 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2835 my $meta = "$RANDOMDIR/$md5.meta";
2316 2836
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2837 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2838 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2839 undef $fh;
2320 aio_rename "$meta~", $meta; 2840 aio_rename "$meta~", $meta;
2321 2841
2842 my $slaying = "?random/$md5";
2843
2844 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2845 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2846 $exit->msg (undef);
2847 }
2324 } 2848 }
2325} 2849}
2326 2850
2327sub cf::object::player::enter_exit { 2851sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2852 my ($self, $exit) = @_;
2329 2853
2330 return unless $self->type == cf::PLAYER; 2854 return unless $self->type == cf::PLAYER;
2331 2855
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2856 $self->enter_link;
2344 2857
2345 (async { 2858 (async {
2346 $self->deactivate_recursive; # just to be sure 2859 $Coro::current->{desc} = "enter_exit";
2860
2347 unless (eval { 2861 unless (eval {
2862 $self->deactivate_recursive; # just to be sure
2863
2864 # random map handling
2865 {
2866 my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868 prepare_random_map $exit
2869 if $exit->slaying eq "/!";
2870 }
2871
2872 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2873 my $x = $exit->stats->hp;
2874 my $y = $exit->stats->sp;
2875
2348 $self->goto ($slaying, $hp, $sp); 2876 $self->goto ($map, $x, $y);
2349 2877
2878 # if exit is damned, update players death & WoR home-position
2879 $self->contr->savebed ($map, $x, $y)
2880 if $exit->flag (cf::FLAG_DAMNED);
2881
2350 1; 2882 1
2351 }) { 2883 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2354 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2888
2357 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2358 $self->leave_link; 2890 $self->leave_link;
2359 } 2891 }
2360 })->prio (1); 2892 })->prio (1);
2361} 2893}
2362 2894
2376 2908
2377 utf8::encode $text; 2909 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2911}
2380 2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2936}
2937
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2939
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2941client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2942the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2943the message unless the client supports the msg packet.
2387 2944
2388=cut 2945=cut
2389 2946
2947# non-persistent channels (usually the info channel)
2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2955 "c/identify" => {
2956 id => "infobox",
2957 title => "Identify",
2958 reply => undef,
2959 tooltip => "Items recently identified",
2960 },
2961 "c/examine" => {
2962 id => "infobox",
2963 title => "Examine",
2964 reply => undef,
2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2972 },
2973 "c/book" => {
2974 id => "infobox",
2975 title => "Book",
2976 reply => undef,
2977 tooltip => "The contents of a note or book",
2978 },
2979 "c/lookat" => {
2980 id => "infobox",
2981 title => "Look",
2982 reply => undef,
2983 tooltip => "What you saw there",
2984 },
2985 "c/who" => {
2986 id => "infobox",
2987 title => "Players",
2988 reply => undef,
2989 tooltip => "Shows players who are currently online",
2990 },
2991 "c/body" => {
2992 id => "infobox",
2993 title => "Body Parts",
2994 reply => undef,
2995 tooltip => "Shows which body parts you posess and are available",
2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
3003 "c/skills" => {
3004 id => "infobox",
3005 title => "Skills",
3006 reply => undef,
3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
3032 },
3033 "c/uptime" => {
3034 id => "infobox",
3035 title => "Uptime",
3036 reply => undef,
3037 tooltip => "How long the server has been running since last restart",
3038 },
3039 "c/mapinfo" => {
3040 id => "infobox",
3041 title => "Map Info",
3042 reply => undef,
3043 tooltip => "Information related to the maps",
3044 },
3045 "c/party" => {
3046 id => "party",
3047 title => "Party",
3048 reply => "gsay ",
3049 tooltip => "Messages and chat related to your party",
3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
3059);
3060
2390sub cf::client::send_msg { 3061sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2392 3063
2393 $msg = $self->pl->expand_cfpod ($msg); 3064 $msg = $self->pl->expand_cfpod ($msg)
3065 unless $color & cf::NDI_VERBATIM;
2394 3066
2395 if ($self->can_msg) { 3067 $color &= cf::NDI_CLIENT_MASK; # just in case...
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407 3068
2408 if ($color >= 0) { 3069 # check predefined channels, for the benefit of C
2409 if (0 && $msg =~ /\[/) { 3070 if ($CHANNEL{$channel}) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 3071 $channel = $CHANNEL{$channel};
2411 } else { 3072
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3073 $self->ext_msg (channel_info => $channel);
2413 $self->send_packet ("drawinfo $color $msg") 3074 $channel = $channel->{id};
3075
3076 } elsif (ref $channel) {
3077 # send meta info to client, if not yet sent
3078 unless (exists $self->{channel}{$channel->{id}}) {
3079 $self->{channel}{$channel->{id}} = $channel;
3080 $self->ext_msg (channel_info => $channel);
2414 } 3081 }
2415 }
2416 }
2417}
2418 3082
3083 $channel = $channel->{id};
3084 }
3085
3086 return unless @extra || length $msg;
3087
3088 # default colour, mask it out
3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3090 if $color & cf::NDI_DEF;
3091
3092 my $pkt = "msg "
3093 . $self->{json_coder}->encode (
3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3095 );
3096
3097 $self->send_big_packet ($pkt);
3098}
3099
2419=item $client->ext_event ($type, %msg) 3100=item $client->ext_msg ($type, @msg)
2420 3101
2421Sends an ext event to the client. 3102Sends an ext event to the client.
2422 3103
2423=cut 3104=cut
2424 3105
2425sub cf::client::ext_event($$%) { 3106sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 3107 my ($self, $type, @msg) = @_;
2427 3108
3109 if ($self->extcmd == 2) {
3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3111 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 3112 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3114 }
3115}
3116
3117=item $client->ext_reply ($msgid, @msg)
3118
3119Sends an ext reply to the client.
3120
3121=cut
3122
3123sub cf::client::ext_reply($$@) {
3124 my ($self, $id, @msg) = @_;
3125
3126 if ($self->extcmd == 2) {
3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3128 } elsif ($self->extcmd == 1) {
3129 #TODO: version 1, remove
3130 unshift @msg, msgtype => "reply", msgid => $id;
3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3132 }
2430} 3133}
2431 3134
2432=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2433 3136
2434Queues a query to the client, calling the given callback with 3137Queues a query to the client, calling the given callback with
2489 my ($ns, $buf) = @_; 3192 my ($ns, $buf) = @_;
2490 3193
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3194 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 3195
2493 if (ref $msg) { 3196 if (ref $msg) {
3197 my ($type, $reply, @payload) =
3198 "ARRAY" eq ref $msg
3199 ? @$msg
3200 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3201
3202 my @reply;
3203
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3204 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 3205 @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 } 3206 }
3207
3208 $ns->ext_reply ($reply, @reply)
3209 if $reply;
3210
2500 } else { 3211 } else {
2501 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2502 } 3213 }
2503 3214
2504 cf::override; 3215 cf::override;
2505 }, 3216 },
2506); 3217);
2526 3237
2527 $coro 3238 $coro
2528} 3239}
2529 3240
2530cf::client->attach ( 3241cf::client->attach (
2531 on_destroy => sub { 3242 on_client_destroy => sub {
2532 my ($ns) = @_; 3243 my ($ns) = @_;
2533 3244
2534 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2535 }, 3246 },
2536); 3247);
2551our $safe = new Safe "safe"; 3262our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
2553 3264
2554$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
2555 3266
2556$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3267$safe->permit_only (Opcode::opset qw(
3268 :base_core :base_mem :base_orig :base_math :base_loop
3269 grepstart grepwhile mapstart mapwhile
3270 sort time
3271));
2557 3272
2558# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
2559 3274
2560=pod 3275=pod
2561 3276
2562The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
2563 3278
2564 cf::object contr pay_amount pay_player map 3279 cf::object
3280 contr pay_amount pay_player map x y force_find force_add destroy
3281 insert remove name archname title slaying race decrease split
3282 value
3283
2565 cf::object::player player 3284 cf::object::player
2566 cf::player peaceful 3285 player
2567 cf::map trigger 3286
3287 cf::player
3288 peaceful
3289
3290 cf::map
3291 trigger
2568 3292
2569=cut 3293=cut
2570 3294
2571for ( 3295for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3297 insert remove inv nrof name archname title slaying race
3298 decrease split destroy change_exp value msg lore send_msg)],
2573 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
2575 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
2576) { 3302) {
2577 no strict 'refs';
2578 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
2579 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2580 for @funs; 3305 for @funs;
2581} 3306}
2582 3307
2597 3322
2598 my $qcode = $code; 3323 my $qcode = $code;
2599 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2600 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
2601 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
2602 local $_; 3330 local $_;
2603 local @safe::cf::_safe_eval_args = values %vars;
2604 3331
2605 my $eval = 3332 my $eval =
2606 "do {\n" 3333 "do {\n"
2607 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2608 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
2609 . $code 3336 . $code
2610 . "\n}" 3337 . "\n}"
2611 ; 3338 ;
2612 3339
3340 if ($CFG{safe_eval}) {
2613 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
2614 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2615 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
2616 3349
2617 if ($@) { 3350 if ($@) {
2618 warn "$@"; 3351 warn "$@",
2619 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
2620 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
2621 } 3354 }
2622 3355
2623 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
2624} 3357}
2625 3358
2639=cut 3372=cut
2640 3373
2641sub register_script_function { 3374sub register_script_function {
2642 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
2643 3376
2644 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
2645 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
2646} 3379}
2647 3380
2648=back 3381=back
2649 3382
2650=cut 3383=cut
2653# the server's init and main functions 3386# the server's init and main functions
2654 3387
2655sub load_facedata($) { 3388sub load_facedata($) {
2656 my ($path) = @_; 3389 my ($path) = @_;
2657 3390
3391 # HACK to clear player env face cache, we need some signal framework
3392 # for this (global event?)
3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3394
3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396
2658 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
2659 3398
2660 my $facedata;
2661 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
2662 or die "$path: $!"; 3400 or die "$path: $!";
2663 3401
2664 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
2665 3403
2666 $facedata->{version} == 2 3404 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 3406
3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3409 $facedata->{resource}{"res/exp_table"} = {
3410 type => FT_RSRC,
3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3413 };
3414 cf::cede_to_tick;
3415
2669 { 3416 {
2670 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
2671 3418
2672 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3423 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2677 Coro::cede; 3426
3427 cf::cede_to_tick;
2678 } 3428 }
2679 3429
2680 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 3431 next unless $info->{smooth};
3432
2682 my $idx = cf::face::find $face 3433 my $idx = cf::face::find $face
2683 or next; 3434 or next;
3435
2684 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3437 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 3439 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 3441 }
2689 Coro::cede; 3442
3443 cf::cede_to_tick;
2690 } 3444 }
2691 } 3445 }
2692 3446
2693 { 3447 {
2694 my $anims = $facedata->{animinfo}; 3448 my $anims = $facedata->{animinfo};
2695 3449
2696 while (my ($anim, $info) = each %$anims) { 3450 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3451 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 3452 cf::cede_to_tick;
2699 } 3453 }
2700 3454
2701 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
2702 } 3456 }
2703 3457
3458 {
3459 my $res = $facedata->{resource};
3460
3461 while (my ($name, $info) = each %$res) {
3462 if (defined $info->{type}) {
3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464
3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466 cf::face::set_type $idx, $info->{type};
3467 } else {
3468 $RESOURCE{$name} = $info; # unused
3469 }
3470
3471 cf::cede_to_tick;
3472 }
3473 }
3474
3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3476
2704 1 3477 1
2705} 3478}
2706 3479
3480register_exticmd fx_want => sub {
3481 my ($ns, $want) = @_;
3482
3483 while (my ($k, $v) = each %$want) {
3484 $ns->fx_want ($k, $v);
3485 }
3486};
3487
3488sub load_resource_file($) {
3489 my $guard = lock_acquire "load_resource_file";
3490
3491 my $status = load_resource_file_ $_[0];
3492 get_slot 0.1, 100;
3493 cf::arch::commit_load;
3494
3495 $status
3496}
3497
2707sub reload_regions { 3498sub reload_regions {
3499 # HACK to clear player env face cache, we need some signal framework
3500 # for this (global event?)
3501 %ext::player_env::MUSIC_FACE_CACHE = ();
3502
2708 load_resource_file "$MAPDIR/regions" 3503 load_resource_file "$MAPDIR/regions"
2709 or die "unable to load regions file\n"; 3504 or die "unable to load regions file\n";
3505
3506 for (cf::region::list) {
3507 $_->{match} = qr/$_->{match}/
3508 if exists $_->{match};
3509 }
2710} 3510}
2711 3511
2712sub reload_facedata { 3512sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 3513 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 3514 or die "unable to load facedata\n";
2715} 3515}
2716 3516
2717sub reload_archetypes { 3517sub reload_archetypes {
2718 load_resource_file "$DATADIR/archetypes" 3518 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n"; 3519 or die "unable to load archetypes\n";
2720 #d# NEED to laod twice to resolve forward references
2721 # this really needs to be done in an extra post-pass
2722 # (which needs to be synchronous, so solve it differently)
2723 load_resource_file "$DATADIR/archetypes"
2724 or die "unable to load archetypes\n";
2725} 3520}
2726 3521
2727sub reload_treasures { 3522sub reload_treasures {
2728 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
2729 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
2730} 3525}
2731 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
2732sub reload_resources { 3550sub reload_resources {
2733 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
2734 3552
3553 reload_exp_table;
3554 reload_materials;
3555 reload_facedata;
3556 reload_sound;
3557 reload_archetypes;
2735 reload_regions; 3558 reload_regions;
2736 reload_facedata;
2737 #reload_archetypes;#d#
2738 reload_archetypes;
2739 reload_treasures; 3559 reload_treasures;
2740 3560
2741 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
2742} 3562}
2743 3563
2744sub init { 3564sub reload_config {
2745 reload_resources; 3565 trace "reloading config file...\n";
2746}
2747 3566
2748sub cfg_load { 3567 0 < aio_load "$CONFDIR/config", my $config
2749 open my $fh, "<:utf8", "$CONFDIR/config" 3568 or die "$CONFDIR/config: $!";
2750 or return;
2751 3569
2752 local $/; 3570 utf8::decode $config;
2753 *CFG = YAML::Syck::Load <$fh>; 3571 *CFG = yaml_load $config;
2754 3572
2755 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2756 3574
2757 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2758 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2759 3577
2760 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
2764 }; 3582 };
2765 warn $@ if $@; 3583 warn $@ if $@;
2766 } 3584 }
2767} 3585}
2768 3586
3587sub pidfile() {
3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3589 or die "$PIDFILE: $!";
3590 flock $fh, &Fcntl::LOCK_EX
3591 or die "$PIDFILE: flock: $!";
3592 $fh
3593}
3594
3595# make sure only one server instance is running at any one time
3596sub atomic {
3597 my $fh = pidfile;
3598
3599 my $pid = <$fh>;
3600 kill 9, $pid if $pid > 0;
3601
3602 seek $fh, 0, 0;
3603 print $fh $$;
3604}
3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
2769sub main { 3615sub main {
3616 cf::init_globals; # initialise logging
3617
3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622
3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3624
2770 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
2771 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
2772 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3627 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2773 (async { 3628 (async {
2774 Event::one_event; 3629 $Coro::current->{desc} = "IDLE BUG HANDLER";
3630 EV::loop EV::LOOP_ONESHOT;
2775 })->prio (Coro::PRIO_MAX); 3631 })->prio (Coro::PRIO_MAX);
2776 }; 3632 };
2777 3633
2778 cfg_load; 3634 evthread_start IO::AIO::poll_fileno;
3635
3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3645 reload_resources;
3646 reload_config;
2779 db_init; 3647 db_init;
3648
3649 cf::init_uuid;
3650 cf::init_signals;
3651 cf::init_skills;
3652
3653 cf::init_beforeplay;
3654
3655 atomic;
3656
2780 load_extensions; 3657 load_extensions;
2781 3658
2782 $TICK_WATCHER->start; 3659 utime time, time, $RUNTIMEFILE;
2783 Event::loop; 3660
3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3664
3665 (pop @POST_INIT)->(0) while @POST_INIT;
3666 };
3667
3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
2784} 3677}
2785 3678
2786############################################################################# 3679#############################################################################
2787# initialisation and cleanup 3680# initialisation and cleanup
2788 3681
2789# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
2790BEGIN { 3683BEGIN {
3684 our %SIGWATCHER = ();
2791 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
2792 Event->signal ( 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2793 reentrant => 0,
2794 data => WF_AUTOCANCEL,
2795 signal => $signal,
2796 prio => 0,
2797 cb => sub {
2798 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
2799 },
2800 ); 3688 };
2801 } 3689 }
2802} 3690}
2803 3691
2804sub write_runtime { 3692sub write_runtime_sync {
2805 my $runtime = "$LOCALDIR/runtime"; 3693 my $t0 = AE::time;
2806 3694
2807 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
2808 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
2809 3697
2810 IO::AIO::aio_utime $runtime, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2811 3699
2812 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
2813 3701
2814 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2815 or return; 3703 or return;
2816 3704
2817 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
2818 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
2819 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
2829 aio_utime $fh, undef, undef; 3717 aio_utime $fh, undef, undef;
2830 3718
2831 close $fh 3719 close $fh
2832 or return; 3720 or return;
2833 3721
2834 aio_rename "$runtime~", $runtime 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2835 and return; 3723 and return;
2836 3724
2837 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2838 3726
2839 1 3727 1
3728}
3729
3730our $uuid_lock;
3731our $uuid_skip;
3732
3733sub write_uuid_sync($) {
3734 $uuid_skip ||= $_[0];
3735
3736 return if $uuid_lock;
3737 local $uuid_lock = 1;
3738
3739 my $uuid = "$LOCALDIR/uuid";
3740
3741 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3742 or return;
3743
3744 my $value = uuid_seq uuid_cur;
3745
3746 unless ($value) {
3747 info "cowardly refusing to write zero uuid value!\n";
3748 return;
3749 }
3750
3751 my $value = uuid_str $value + $uuid_skip;
3752 $uuid_skip = 0;
3753
3754 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3755 and return;
3756
3757 # always fsync - this file is important
3758 aio_fsync $fh
3759 and return;
3760
3761 close $fh
3762 or return;
3763
3764 aio_rename "$uuid~", $uuid
3765 and return;
3766
3767 trace "uuid file written ($value).\n";
3768
3769 1
3770
3771}
3772
3773sub write_uuid($$) {
3774 my ($skip, $sync) = @_;
3775
3776 $sync ? write_uuid_sync $skip
3777 : async { write_uuid_sync $skip };
2840} 3778}
2841 3779
2842sub emergency_save() { 3780sub emergency_save() {
2843 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
2844 3782
2845 warn "enter emergency perl save\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
2846 3789
2847 cf::sync_job { 3790 cf::sync_job {
3791 cf::write_runtime_sync; # external watchdog should not bark
3792
2848 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
2849 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
2850 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
2851 warn "begin emergency player save\n"; 3796 info "emergency_perl_save: begin player save\n";
2852 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
2853 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
2854 $pl->valid or next; 3799 $pl->valid or next;
3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2855 $pl->save; 3801 $pl->save;
2856 } 3802 }
2857 warn "end emergency player save\n"; 3803 info "emergency_perl_save: end player save\n";
2858 3804
2859 warn "begin emergency map save\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin map save\n";
2860 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
2861 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
2862 $map->valid or next; 3810 $map->valid or next;
2863 $map->save; 3811 $map->save;
2864 } 3812 }
2865 warn "end emergency map save\n"; 3813 info "emergency_perl_save: end map save\n";
2866 3814
2867 warn "begin emergency database checkpoint\n"; 3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 info "emergency_perl_save: begin database checkpoint\n";
2868 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
2869 warn "end emergency database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3820
3821 info "emergency_perl_save: begin write uuid\n";
3822 write_uuid_sync 1;
3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
2870 }; 3843 };
2871 3844
2872 warn "leave emergency perl save\n"; 3845 info "emergency_perl_save: leave\n";
2873} 3846}
2874 3847
2875sub post_cleanup { 3848sub post_cleanup {
2876 my ($make_core) = @_; 3849 my ($make_core) = @_;
2877 3850
3851 IO::AIO::flush;
3852
2878 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
2879 if $make_core; 3854 if $make_core;
3855
3856 my $fh = pidfile;
3857 unlink $PIDFILE if <$fh> == $$;
3858}
3859
3860# a safer delete_package, copied from Symbol
3861sub clear_package($) {
3862 my $pkg = shift;
3863
3864 # expand to full symbol table name if needed
3865 unless ($pkg =~ /^main::.*::$/) {
3866 $pkg = "main$pkg" if $pkg =~ /^::/;
3867 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3868 $pkg .= '::' unless $pkg =~ /::$/;
3869 }
3870
3871 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3872 my $stem_symtab = *{$stem}{HASH};
3873
3874 defined $stem_symtab and exists $stem_symtab->{$leaf}
3875 or return;
3876
3877 # clear all symbols
3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3879 for my $name (keys %$leaf_symtab) {
3880 _gv_clear *{"$pkg$name"};
3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3882 }
2880} 3883}
2881 3884
2882sub do_reload_perl() { 3885sub do_reload_perl() {
2883 # can/must only be called in main 3886 # can/must only be called in main
2884 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
2885 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
2886 return; 3889 return;
2887 } 3890 }
2888 3891
3892 return if $RELOAD++;
3893
3894 my $t1 = AE::time;
3895
3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
2889 warn "reloading..."; 3898 info "reloading...";
2890 3899
2891 warn "entering sync_job"; 3900 trace "entering sync_job";
2892 3901
2893 cf::sync_job { 3902 cf::sync_job {
2894 cf::write_runtime; # external watchdog should not bark
2895 cf::emergency_save; 3903 #cf::emergency_save;
2896 cf::write_runtime; # external watchdog should not bark
2897 3904
2898 warn "syncing database to disk";
2899 BDB::db_env_txn_checkpoint $DB_ENV;
2900
2901 # if anything goes wrong in here, we should simply crash as we already saved
2902
2903 warn "cancelling all WF_AUTOCANCEL watchers";
2904 for (Event::all_watchers) {
2905 $_->cancel if $_->data & WF_AUTOCANCEL;
2906 }
2907
2908 warn "flushing outstanding aio requests";
2909 for (;;) {
2910 BDB::flush;
2911 IO::AIO::flush;
2912 Coro::cede;
2913 last unless IO::AIO::nreqs || BDB::nreqs;
2914 warn "iterate...";
2915 }
2916
2917 ++$RELOAD;
2918
2919 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
2920 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
2921 %EXT_CORO = (); 3907 %EXT_CORO = ();
2922 3908
2923 warn "removing commands"; 3909 trace "removing commands";
2924 %COMMAND = (); 3910 %COMMAND = ();
2925 3911
2926 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
2927 %EXTCMD = (); 3913 %EXTCMD = ();
2928 %EXTICMD = (); 3914 %EXTICMD = ();
2929 3915
2930 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
2931 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
2932 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
2933 3919
2934 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
2935 eval { 3921 eval {
2936 $cb->($pkg); 3922 $cb->($pkg);
2937 1 3923 1
2938 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3925 }
3926
3927 trace "... clearing $pkg";
3928 clear_package $pkg;
2939 } 3929 }
2940 3930
2941 warn "... nuking $pkg";
2942 Symbol::delete_package $pkg;
2943 }
2944
2945 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
2946 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
2947 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2948 3934
2949 warn "... unloading $k"; 3935 trace "... unloading $k";
2950 delete $INC{$k}; 3936 delete $INC{$k};
2951 3937
2952 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
2953 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
2954 3940
2955 if (my $cb = $k->can ("unload_module")) { 3941 if (my $cb = $k->can ("unload_module")) {
2956 $cb->(); 3942 $cb->();
3943 }
3944
3945 clear_package $k;
2957 } 3946 }
2958 3947
2959 Symbol::delete_package $k;
2960 }
2961
2962 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
2963 Symbol::delete_package "safe::$_" 3949 clear_package "safe::$_"
2964 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2965 3951
2966 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
2967 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
2968 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2969 3955
2970 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
2971 # and global variables created in xs 3957 # and global variables created in xs
2972 #Symbol::delete_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
2973 3959
2974 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
2975 3961
2976 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
2977 require cf; 3963 require cf;
2978 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
2979 3965
2980 warn "loading config and database again"; 3966 trace "loading config and database again";
2981 cf::cfg_load; 3967 cf::reload_config;
2982 3968
2983 warn "loading extensions"; 3969 trace "loading extensions";
2984 cf::load_extensions; 3970 cf::load_extensions;
2985 3971
3972 if ($REATTACH_ON_RELOAD) {
2986 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
2987 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
2988 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
2989 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
2990 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
2991 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3979 }
2992 3980
3981 trace "running post_init jobs";
3982 (pop @POST_INIT)->(1) while @POST_INIT;
3983
2993 warn "leaving sync_job"; 3984 trace "leaving sync_job";
2994 3985
2995 1 3986 1
2996 } or do { 3987 } or do {
2997 warn $@; 3988 error $@;
2998 warn "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
2999 exit 1; 3990 };
3991
3992 info "reloaded";
3993 --$RELOAD;
3000 }; 3994 }
3001 3995
3002 warn "reloaded"; 3996 $t1 = AE::time - $t1;
3997 info "reload completed in ${t1}s\n";
3003}; 3998};
3004 3999
3005our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3006 4001
3007sub reload_perl() { 4002sub reload_perl() {
3008 # doing reload synchronously and two reloads happen back-to-back, 4003 # doing reload synchronously and two reloads happen back-to-back,
3009 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3010 4005
3011 $RELOAD_WATCHER ||= Event->timer ( 4006 $RELOAD_WATCHER ||= cf::async {
3012 reentrant => 0, 4007 Coro::AIO::aio_wait cache_extensions;
3013 after => 0, 4008
3014 data => WF_AUTOCANCEL, 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3015 cb => sub {
3016 do_reload_perl; 4010 do_reload_perl;
3017 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3018 }, 4012 };
3019 ); 4013 };
3020} 4014}
3021 4015
3022register_command "reload" => sub { 4016register_command "reload" => sub {
3023 my ($who, $arg) = @_; 4017 my ($who, $arg) = @_;
3024 4018
3025 if ($who->flag (FLAG_WIZ)) { 4019 if ($who->flag (FLAG_WIZ)) {
3026 $who->message ("reloading server."); 4020 $who->message ("reloading server.");
4021 async {
4022 $Coro::current->{desc} = "perl_reload";
3027 async { reload_perl }; 4023 reload_perl;
4024 };
3028 } 4025 }
3029}; 4026};
3030 4027
3031unshift @INC, $LIBDIR; 4028#############################################################################
3032 4029
3033my $bug_warning = 0; 4030my $bug_warning = 0;
3034 4031
3035our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3036our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3037 4034
3038sub wait_for_tick { 4035sub wait_for_tick() {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3041 4037
3042 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3044 $signal->wait; 4040 $signal->wait;
3045} 4041}
3046 4042
3047sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3048 return unless $TICK_WATCHER->is_active;
3049 return if $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3050 4045
3051 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3052 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3053 $signal->wait; 4048 $signal->wait;
3054} 4049}
3055 4050
3056 my $min = 1e6;#d# 4051sub tick {
3057 my $avg = 10;
3058$TICK_WATCHER = Event->timer (
3059 reentrant => 0,
3060 parked => 1,
3061 prio => 0,
3062 at => $NEXT_TICK || $TICK,
3063 data => WF_AUTOCANCEL,
3064 cb => sub {
3065 if ($Coro::current != $Coro::main) { 4052 if ($Coro::current != $Coro::main) {
3066 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4053 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3067 unless ++$bug_warning > 10; 4054 unless ++$bug_warning > 10;
3068 return; 4055 return;
3069 } 4056 }
3070 4057
3071 $NOW = $tick_start = Event::time;
3072
3073 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3074 4059
3075 0 && sync_job {#d# 4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3076 for(1..10) {
3077 my $t = Event::time;
3078 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3079 or die;
3080 4061
3081 $map->width (50); 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3082 $map->height (50); 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3083 $map->alloc; 4064 Coro::async_pool {
3084 $map->_load_objects ("/tmp/x.map", 1); 4065 $Coro::current->{desc} = "runtime saver";
3085 my $t = Event::time - $t; 4066 write_runtime_sync
3086 4067 or error "ERROR: unable to write runtime file: $!";
3087 #next unless $t < 0.0013;#d#
3088 if ($t < $min) {
3089 $min = $t;
3090 }
3091 $avg = $avg * 0.99 + $t * 0.01;
3092 }
3093 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3094 exit 0;
3095 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3096 }; 4068 };
4069 }
3097 4070
3098 $RUNTIME += $TICK;
3099 $NEXT_TICK += $TICK;
3100
3101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3102 $NEXT_RUNTIME_WRITE = $NOW + 10;
3103 Coro::async_pool {
3104 write_runtime
3105 or warn "ERROR: unable to write runtime file: $!";
3106 };
3107 }
3108
3109# my $AFTER = Event::time;
3110# warn $AFTER - $NOW;#d#
3111
3112 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3113 $sig->send; 4072 $sig->send;
3114 } 4073 }
3115 while (my $sig = shift @WAIT_FOR_TICK) { 4074 while (my $sig = shift @WAIT_FOR_TICK) {
3116 $sig->send; 4075 $sig->send;
3117 } 4076 }
3118 4077
3119 $NOW = Event::time; 4078 $LOAD = ($NOW - $TICK_START) / $TICK;
3120
3121 # if we are delayed by four ticks or more, skip them all
3122 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3123
3124 $TICK_WATCHER->at ($NEXT_TICK);
3125 $TICK_WATCHER->start;
3126
3127 $LOAD = ($NOW - $tick_start) / $TICK;
3128 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4079 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3129 4080
3130 _post_tick; 4081 if (0) {
3131 4082 if ($NEXT_TICK) {
3132 4083 my $jitter = $TICK_START - $NEXT_TICK;
4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4085 debug "jitter $JITTER\n";#d#
4086 }
3133 }, 4087 }
3134); 4088}
3135 4089
3136{ 4090{
3137 BDB::max_poll_time $TICK * 0.1; 4091 # configure BDB
3138 $BDB_POLL_WATCHER = Event->io ( 4092
3139 reentrant => 0,
3140 fd => BDB::poll_fileno,
3141 poll => 'r',
3142 prio => 0,
3143 data => WF_AUTOCANCEL,
3144 cb => \&BDB::poll_cb,
3145 );
3146 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3147 4094 BDB::max_poll_reqs $TICK * 0.1;
3148 BDB::set_sync_prepare { 4095 $AnyEvent::BDB::WATCHER->priority (1);
3149 my $status;
3150 my $current = $Coro::current;
3151 (
3152 sub {
3153 $status = $!;
3154 $current->ready; undef $current;
3155 },
3156 sub {
3157 Coro::schedule while defined $current;
3158 $! = $status;
3159 },
3160 )
3161 };
3162 4096
3163 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3164 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
4099 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4101 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4102 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4103 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3165 4104
3166 cf::sync_job { 4105 cf::sync_job {
3167 eval { 4106 eval {
3168 BDB::db_env_open 4107 BDB::db_env_open
3169 $DB_ENV, 4108 $DB_ENV,
3171 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4110 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3172 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4111 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3173 0666; 4112 0666;
3174 4113
3175 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4114 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3176
3177 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3178 $DB_ENV->set_lk_detect;
3179 }; 4115 };
3180 4116
3181 cf::cleanup "db_env_open(db): $@" if $@; 4117 cf::cleanup "db_env_open(db): $@" if $@;
3182 }; 4118 };
3183 } 4119 }
4120
4121 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4122 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4123 };
4124 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4125 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4126 };
4127 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4128 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4129 };
3184} 4130}
3185 4131
3186{ 4132{
4133 # configure IO::AIO
4134
3187 IO::AIO::min_parallel 8; 4135 IO::AIO::min_parallel 8;
3188
3189 undef $Coro::AIO::WATCHER;
3190 IO::AIO::max_poll_time $TICK * 0.1; 4136 IO::AIO::max_poll_time $TICK * 0.1;
3191 $AIO_POLL_WATCHER = Event->io ( 4137 undef $AnyEvent::AIO::WATCHER;
3192 reentrant => 0,
3193 data => WF_AUTOCANCEL,
3194 fd => IO::AIO::poll_fileno,
3195 poll => 'r',
3196 prio => 6,
3197 cb => \&IO::AIO::poll_cb,
3198 );
3199} 4138}
3200 4139
3201my $_log_backtrace; 4140my $_log_backtrace;
3202 4141
3203sub _log_backtrace { 4142sub _log_backtrace {
3206 $msg =~ s/\n//; 4145 $msg =~ s/\n//;
3207 4146
3208 # limit the # of concurrent backtraces 4147 # limit the # of concurrent backtraces
3209 if ($_log_backtrace < 2) { 4148 if ($_log_backtrace < 2) {
3210 ++$_log_backtrace; 4149 ++$_log_backtrace;
4150 my $perl_bt = Carp::longmess $msg;
3211 async { 4151 async {
4152 $Coro::current->{desc} = "abt $msg";
4153
3212 my @bt = fork_call { 4154 my @bt = fork_call {
3213 @addr = map { sprintf "%x", $_ } @addr; 4155 @addr = map { sprintf "%x", $_ } @addr;
3214 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3215 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3216 or die "addr2line: $!"; 4158 or die "addr2line: $!";
3224 } 4166 }
3225 4167
3226 @funcs 4168 @funcs
3227 }; 4169 };
3228 4170
3229 LOG llevInfo, "[ABT] $msg\n"; 4171 LOG llevInfo, "[ABT] $perl_bt\n";
4172 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3230 LOG llevInfo, "[ABT] $_\n" for @bt; 4173 LOG llevInfo, "[ABT] $_\n" for @bt;
3231 --$_log_backtrace; 4174 --$_log_backtrace;
3232 }; 4175 };
3233 } else { 4176 } else {
3234 LOG llevInfo, "[ABT] $msg\n"; 4177 LOG llevInfo, "[ABT] $msg\n";
3235 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3236 } 4179 }
3237} 4180}
3238 4181
3239# load additional modules 4182# load additional modules
3240use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3241 4185
3242END { cf::emergency_save } 4186END { cf::emergency_save }
3243 4187
32441 41881
3245 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines