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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines