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.116 by root, Mon Jan 1 17:30:34 2007 UTC vs.
Revision 1.124 by root, Tue Jan 2 22:55:05 2007 UTC

… …
179=cut 179=cut
180 180
181sub to_json($) { 181sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 183 JSON::Syck::Dump $_[0]
184}
185
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string
209
210Wait until the given lock is available. See cf::lock_acquire.
211
212=item my $lock = cf::lock_acquire $string
213
214Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically
217returned.
218
219Lock names should begin with a unique identifier (for example, find_map
220uses map_find and load_map uses map_load).
221
222=cut
223
224our %LOCK;
225
226sub lock_wait($) {
227 my ($key) = @_;
228
229 # wait for lock, if any
230 while ($LOCK{$key}) {
231 push @{ $LOCK{$key} }, $Coro::current;
232 Coro::schedule;
233 }
234}
235
236sub lock_acquire($) {
237 my ($key) = @_;
238
239 # wait, to be sure we are not locked
240 lock_wait $key;
241
242 $LOCK{$key} = [];
243
244 cf::guard {
245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} };
247 }
184} 248}
185 249
186=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
187 251
188The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
… …
817 (aio_load "$filename.pst", $av) >= 0 881 (aio_load "$filename.pst", $av) >= 0
818 or return; 882 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 883 $av = eval { (Storable::thaw $av)->{objs} };
820 } 884 }
821 885
886 warn sprintf "loading %s (%d)\n",
887 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 888 return ($data, $av);
823} 889}
824 890
825############################################################################# 891#############################################################################
826# command handling &c 892# command handling &c
… …
1087# and all this just because we cannot iterate over 1153# and all this just because we cannot iterate over
1088# all maps in C++... 1154# all maps in C++...
1089sub change_all_map_light { 1155sub change_all_map_light {
1090 my ($change) = @_; 1156 my ($change) = @_;
1091 1157
1092 $_->change_map_light ($change) for values %cf::MAP; 1158 $_->change_map_light ($change)
1159 for grep $_->outdoor, values %cf::MAP;
1093} 1160}
1094 1161
1095sub try_load_header($) { 1162sub try_load_header($) {
1096 my ($path) = @_; 1163 my ($path) = @_;
1097 1164
… …
1116 #warn "find_map<$path,$origin>\n";#d# 1183 #warn "find_map<$path,$origin>\n";#d#
1117 1184
1118 $path = new cf::path $path, $origin && $origin->path; 1185 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1186 my $key = $path->as_string;
1120 1187
1188 cf::lock_wait "map_find:$key";
1189
1121 $cf::MAP{$key} || do { 1190 $cf::MAP{$key} || do {
1191 my $guard = cf::lock_acquire "map_find:$key";
1192
1122 # do it the slow way 1193 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1194 my $map = try_load_header $path->save_path;
1124 1195
1125 if ($map) { 1196 if ($map) {
1126 # safety 1197 # safety
… …
1148 $map->{last_save} = $cf::RUNTIME; 1219 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1220 $map->last_access ($cf::RUNTIME);
1150 1221
1151 if ($map->should_reset) { 1222 if ($map->should_reset) {
1152 $map->reset; 1223 $map->reset;
1224 undef $guard;
1153 $map = find_map $path; 1225 $map = cf::map::find_map ($path)
1226 or return;
1154 } 1227 }
1155 1228
1156 $cf::MAP{$key} = $map 1229 $cf::MAP{$key} = $map
1157 } 1230 }
1158} 1231}
1159 1232
1160sub load { 1233sub load {
1161 my ($self) = @_; 1234 my ($self) = @_;
1162 1235
1236 my $path = $self->{path};
1237 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1238
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1239 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1240
1165 $self->in_memory (cf::MAP_LOADING); 1241 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1242
1169 $self->alloc; 1243 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1244 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1245 or return;
1172 1246
… …
1214} 1288}
1215 1289
1216sub save { 1290sub save {
1217 my ($self) = @_; 1291 my ($self) = @_;
1218 1292
1293 $self->{last_save} = $cf::RUNTIME;
1294
1295 return unless $self->dirty;
1296
1219 my $save = $self->{path}->save_path; utf8::encode $save; 1297 my $save = $self->{path}->save_path; utf8::encode $save;
1220 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1221
1222 $self->{last_save} = $cf::RUNTIME;
1223
1224 return unless $self->dirty;
1225 1299
1226 $self->{load_path} = $save; 1300 $self->{load_path} = $save;
1227 1301
1228 return if $self->{deny_save}; 1302 return if $self->{deny_save};
1229 1303
… …
1405=cut 1479=cut
1406 1480
1407sub cf::object::player::enter_link { 1481sub cf::object::player::enter_link {
1408 my ($self) = @_; 1482 my ($self) = @_;
1409 1483
1484 $self->deactivate_recursive;
1485
1410 return if $self->map == $LINK_MAP; 1486 return if $self->map == $LINK_MAP;
1411 1487
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1489 if $self->map;
1414 1490
1415 $self->enter_map ($LINK_MAP, 20, 20); 1491 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1492}
1418 1493
1419sub cf::object::player::leave_link { 1494sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1495 my ($self, $map, $x, $y) = @_;
1421 1496
… …
1444 1519
1445 $self->activate_recursive; 1520 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1521 $self->enter_map ($map, $x, $y);
1447} 1522}
1448 1523
1524cf::player->attach (
1525 on_logout => sub {
1526 my ($pl) = @_;
1527
1528 # abort map switching before logout
1529 if ($pl->ob->{_link_pos}) {
1530 cf::sync_job {
1531 $pl->ob->leave_link
1532 };
1533 }
1534 },
1535 on_login => sub {
1536 my ($pl) = @_;
1537
1538 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) {
1541 $pl->ob->enter_link;
1542 Coro::async {
1543 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn
1545 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link;
1547 };
1548 }
1549 },
1550);
1551
1449=item $player_object->goto_map ($map, $x, $y) 1552=item $player_object->goto_map ($path, $x, $y)
1450 1553
1451=cut 1554=cut
1452 1555
1453sub cf::object::player::goto_map { 1556sub cf::object::player::goto_map {
1454 my ($self, $path, $x, $y) = @_; 1557 my ($self, $path, $x, $y) = @_;
… …
1459 $path = new cf::path $path; 1562 $path = new cf::path $path;
1460 1563
1461 my $map = cf::map::find_map $path->as_string; 1564 my $map = cf::map::find_map $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1565 $map = $map->customise_for ($self) if $map;
1463 1566
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1567# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1568# if $map;
1466 1569
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1570 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1571
1469 $self->leave_link ($map, $x, $y); 1572 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1573 })->prio (1);
… …
1813 1916
1814{ 1917{
1815 my $path = cf::localdir . "/database.pst"; 1918 my $path = cf::localdir . "/database.pst";
1816 1919
1817 sub db_load() { 1920 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 1921 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 1922 }
1821 1923
1822 my $pid; 1924 my $pid;
1823 1925
1824 sub db_save() { 1926 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 1927 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 1928 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 1929 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 1930 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 1931 rename "$path~", $path;

Diff Legend

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