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.335 by root, Mon Aug 20 22:21:48 2007 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines