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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines