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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines