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.318 by root, Tue Jul 24 04:55:34 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines