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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines