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.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC

… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
56 57
57binmode STDOUT; 58binmode STDOUT;
58binmode STDERR; 59binmode STDERR;
59 60
60# read virtual server time, if available 61# read virtual server time, if available
… …
179sub to_json($) { 180sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
182} 183}
183 184
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string 185=item cf::lock_wait $string
207 186
208Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
209 188
210=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
211 190
212Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
215returned. 194returned.
216 195
217Lock names should begin with a unique identifier (for example, cf::map::find 196Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load). 197uses map_find and cf::map::load uses map_load).
… …
237 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
238 lock_wait $key; 217 lock_wait $key;
239 218
240 $LOCK{$key} = []; 219 $LOCK{$key} = [];
241 220
242 cf::guard { 221 Coro::guard {
243 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
245 } 224 }
246} 225}
247 226
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop { 227sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 228 return unless $TICK_WATCHER->is_active;
266 229
267 my $guard = guard { $TICK_WATCHER->start }; 230 my $guard = Coro::guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop; 231 $TICK_WATCHER->stop;
269 $guard 232 $guard
270} 233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
271 244
272=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
273 246
274The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
275always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
294 my $freeze_guard = freeze_mainloop; 267 my $freeze_guard = freeze_mainloop;
295 268
296 my $busy = 1; 269 my $busy = 1;
297 my @res; 270 my @res;
298 271
299 (Coro::async { 272 (async {
300 @res = eval { $job->() }; 273 @res = eval { $job->() };
301 warn $@ if $@; 274 warn $@ if $@;
302 undef $busy; 275 undef $busy;
303 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
304 277
305 while ($busy) { 278 while ($busy) {
306 Coro::cede_notself; 279 Coro::cede or Event::one_event;
307 Event::one_event unless Coro::nready;
308 } 280 }
309 281
310 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
311 } else { 283 } else {
312 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
313 285
314 $job->() 286 $job->()
315 } 287 }
316} 288}
317 289
318=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
319 291
320Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
321when the extension calling this is being unloaded. 293extension calling this is being unloaded.
322 294
323=cut 295=cut
324 296
325sub coro(&) { 297sub async_ext(&) {
326 my $cb = shift; 298 my $cb = shift;
327 299
328 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
329 301
330 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
331 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
332 }); 304 });
333 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1100 1072
1101=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1102 1074
1103Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1104 1076
1077=cut
1078
1079package cf::player;
1080
1105=head3 cf::player 1081=head3 cf::player
1106 1082
1107=over 4 1083=over 4
1108 1084
1109=item cf::player::exists $login 1085=item cf::player::find $login
1110 1086
1111Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1112 1088
1113=cut 1089=cut
1114 1090
1115sub cf::player::exists($) { 1091sub path($) {
1116 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1117 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1118} 1147}
1119 1148
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1150
1122Sends an ext reply to the player. 1151Sends an ext reply to the player.
1123 1152
1124=cut 1153=cut
1125 1154
1126sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1128 1157
1129 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1130 1159
1131 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1132} 1161}
1162
1163package cf;
1133 1164
1134=back 1165=back
1135 1166
1136 1167
1137=head3 cf::map 1168=head3 cf::map
… …
1184 or return; 1215 or return;
1185 1216
1186 my $map = cf::map::new 1217 my $map = cf::map::new
1187 or return; 1218 or return;
1188 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1189 $map->load_header ($path) 1223 $map->load_header ($path)
1190 or return; 1224 or return;
1191 1225
1192 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1193 1227
… …
1315} 1349}
1316 1350
1317sub save { 1351sub save {
1318 my ($self) = @_; 1352 my ($self) = @_;
1319 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1320 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1321 1357
1322 return unless $self->dirty; 1358 return unless $self->dirty;
1323 1359
1324 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1327 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1328 1364
1329 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1330 1366
1331 local $self->{last_access} = $self->last_access;#d# 1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1332 1372
1333 if ($uniq) { 1373 if ($uniq) {
1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1335 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1336 } else { 1376 } else {
… …
1342 my ($self) = @_; 1382 my ($self) = @_;
1343 1383
1344 # save first because save cedes 1384 # save first because save cedes
1345 $self->save; 1385 $self->save;
1346 1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1347 return if $self->players; 1389 return if $self->players;
1348 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1349 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1350 1392
1351 $self->clear; 1393 $self->clear;
… …
1392 $self->save; 1434 $self->save;
1393} 1435}
1394 1436
1395sub reset { 1437sub reset {
1396 my ($self) = @_; 1438 my ($self) = @_;
1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1397 1441
1398 return if $self->players; 1442 return if $self->players;
1399 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1400 1444
1401 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
… …
1546 ($x, $y) = ($map->enter_x, $map->enter_y) 1590 ($x, $y) = ($map->enter_x, $map->enter_y)
1547 if $x <=0 && $y <= 0; 1591 if $x <=0 && $y <= 0;
1548 1592
1549 $map->load; 1593 $map->load;
1550 1594
1595 return unless $self->contr->active;
1551 $self->activate_recursive; 1596 $self->activate_recursive;
1552 $self->enter_map ($map, $x, $y); 1597 $self->enter_map ($map, $x, $y);
1553} 1598}
1554 1599
1555cf::player->attach ( 1600cf::player->attach (
… …
1568 1613
1569 # try to abort aborted map switching on player login :) 1614 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes 1615 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) { 1616 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link; 1617 $pl->ob->enter_link;
1573 cf::async { 1618 (async {
1574 # we need this sleep as the login has a concurrent enter_exit running 1619 # we need this sleep as the login has a concurrent enter_exit running
1575 # and this sleep increases chances of the player not ending up in scorn 1620 # and this sleep increases chances of the player not ending up in scorn
1621 $pl->ob->reply (undef,
1622 "There was an internal problem at your last logout, "
1623 . "the server will try to bring you to your intended destination in a second.",
1624 cf::NDI_RED);
1576 Coro::Timer::sleep 1; 1625 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link; 1626 $pl->ob->leave_link;
1578 }; 1627 })->prio (2);
1579 } 1628 }
1580 }, 1629 },
1581); 1630);
1582 1631
1583=item $player_object->goto_map ($path, $x, $y) 1632=item $player_object->goto ($path, $x, $y)
1584 1633
1585=cut 1634=cut
1586 1635
1587sub cf::object::player::goto_map { 1636sub cf::object::player::goto {
1588 my ($self, $path, $x, $y) = @_; 1637 my ($self, $path, $x, $y) = @_;
1589 1638
1590 $self->enter_link; 1639 $self->enter_link;
1591 1640
1592 (cf::async { 1641 (async {
1593 $path = new cf::path $path; 1642 $path = new cf::path $path;
1594 1643
1595 my $map = cf::map::find $path->as_string; 1644 my $map = cf::map::find $path->as_string;
1596 $map = $map->customise_for ($self) if $map; 1645 $map = $map->customise_for ($self) if $map;
1597 1646
… …
1659 1708
1660 return unless $self->type == cf::PLAYER; 1709 return unless $self->type == cf::PLAYER;
1661 1710
1662 $self->enter_link; 1711 $self->enter_link;
1663 1712
1664 (cf::async { 1713 (async {
1665 $self->deactivate_recursive; # just to be sure 1714 $self->deactivate_recursive; # just to be sure
1666 unless (eval { 1715 unless (eval {
1667 prepare_random_map $exit 1716 prepare_random_map $exit
1668 if $exit->slaying eq "/!"; 1717 if $exit->slaying eq "/!";
1669 1718
1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1719 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672 1721
1673 1; 1722 1;
1674 }) { 1723 }) {
1675 $self->message ("Something went wrong deep within the crossfire server. " 1724 $self->message ("Something went wrong deep within the crossfire server. "
1676 . "I'll try to bring you back to the map you were before. " 1725 . "I'll try to bring you back to the map you were before. "
… …
1750 } 1799 }
1751 } 1800 }
1752 }, 1801 },
1753); 1802);
1754 1803
1755=item $client->coro (\&cb) 1804=item $client->async (\&cb)
1756 1805
1757Create a new coroutine, running the specified callback. The coroutine will 1806Create a new coroutine, running the specified callback. The coroutine will
1758be automatically cancelled when the client gets destroyed (e.g. on logout, 1807be automatically cancelled when the client gets destroyed (e.g. on logout,
1759or loss of connection). 1808or loss of connection).
1760 1809
1761=cut 1810=cut
1762 1811
1763sub cf::client::coro { 1812sub cf::client::async {
1764 my ($self, $cb) = @_; 1813 my ($self, $cb) = @_;
1765 1814
1766 my $coro = &cf::async ($cb); 1815 my $coro = &Coro::async ($cb);
1767 1816
1768 $coro->on_destroy (sub { 1817 $coro->on_destroy (sub {
1769 delete $self->{_coro}{$coro+0}; 1818 delete $self->{_coro}{$coro+0};
1770 }); 1819 });
1771 1820
… …
2009 local $/; 2058 local $/;
2010 *CFG = YAML::Syck::Load <$fh>; 2059 *CFG = YAML::Syck::Load <$fh>;
2011 2060
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2061 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013 2062
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065
2014 if (exists $CFG{mlockall}) { 2066 if (exists $CFG{mlockall}) {
2015 eval { 2067 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall 2068 $CFG{mlockall} ? &mlockall : &munlockall
2017 and die "WARNING: m(un)lockall failed: $!\n"; 2069 and die "WARNING: m(un)lockall failed: $!\n";
2018 }; 2070 };
… …
2022 2074
2023sub main { 2075sub main {
2024 # we must not ever block the main coroutine 2076 # we must not ever block the main coroutine
2025 local $Coro::idle = sub { 2077 local $Coro::idle = sub {
2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2078 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2027 (Coro::unblock_sub {
2028 Event::one_event; 2079 async { Event::one_event };
2029 })->();
2030 }; 2080 };
2031 2081
2032 cfg_load; 2082 cfg_load;
2033 db_load; 2083 db_load;
2034 load_extensions; 2084 load_extensions;
… …
2142 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2144 2194
2145 # dirty hack because... archetypes are not yet loaded 2195 # dirty hack because... archetypes are not yet loaded
2146 Event->timer ( 2196 Event->timer (
2147 after => 2, 2197 after => 10,
2148 cb => sub { 2198 cb => sub {
2149 $_[0]->w->cancel; 2199 $_[0]->w->cancel;
2150 2200
2151 # provide some exits "home" 2201 # provide some exits "home"
2152 my $exit = cf::object::new "exit"; 2202 my $exit = cf::object::new "exit";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines